austinywang · Oct 2, 2026 · Oct 1, 2026 · Oct 1, 2026 · Oct 1, 2026 · Oct 2, 2026
diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Surfaces/SurfaceOwnershipPolicy.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Surfaces/SurfaceOwnershipPolicy.swift
@@ -11,13 +11,18 @@ public struct SurfaceOwnershipPolicy: Equatable, Sendable {
 
     public let cloudMachine: SurfaceMachineID?
 
-    public func rejection(for source: SurfaceMachineID?) -> SurfaceTransferRejection? {
-        guard let cloudMachine else { return nil }
+    public func rejection(for source: SurfaceMachineID?, kind: SurfaceResourceKind? = nil) -> SurfaceTransferRejection? {
+        guard kind != .browser, let cloudMachine else { return nil }
         return source == cloudMachine ? nil : .cloudMachineMismatch
     }
 
     public func rejection(for resources: [SurfaceResourceID]) -> SurfaceTransferRejection? {
-        rejection(for: resources.map(\.machine))
+        guard cloudMachine != nil else { return nil }
+        guard !resources.isEmpty else { return .cloudMachineMismatch }
+        let ownedResources = resources.filter { $0.kind != .browser }
+        guard !ownedResources.isEmpty else { return nil }
+        return ownedResources.contains(where: { rejection(for: $0.machine, kind: $0.kind) != nil })
+            ? .cloudMachineMismatch : nil
     }
 
     public func rejection(for machines: [SurfaceMachineID]) -> SurfaceTransferRejection? {

diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Surfaces/SurfaceTransferRejection.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Surfaces/SurfaceTransferRejection.swift
@@ -9,7 +9,7 @@ public enum SurfaceTransferRejection: Error, LocalizedError, Equatable, Sendable
     public var message: String {
         String(
             localized: "surfaceDrop.cloudMachineMismatch",
-            defaultValue: "Cloud workspaces can only hold terminals, browsers, and displays from their own Cloud machine. Open a local workspace and move the splits there."
+            defaultValue: "Cloud workspaces can only hold terminals and displays from their own Cloud machine. Browser tabs can move freely. Open a local workspace to move other splits there."
         )
     }
 }
diff --git a/Packages/macOS/CmuxCloud/Tests/CmuxCloudTests/SurfaceOwnershipPolicyCrossTeamTests.swift b/Packages/macOS/CmuxCloud/Tests/CmuxCloudTests/SurfaceOwnershipPolicyCrossTeamTests.swift
@@ -3,9 +3,8 @@ import CmuxSurfaceCatalogModel
 import Foundation
 import Testing
 
-/// Surfaces from several teams can be open at once. Team is never an input to
-/// the drop rule: a Cloud workspace belongs to one machine, and a machine
-/// belongs to one team, so the machine check already excludes every other team.
+/// Terminals and displays retain their machine boundary. Browser tabs remain
+/// portable while retaining their original resource identity and access route.
 @Suite("Surface ownership across teams")
 struct SurfaceOwnershipPolicyCrossTeamTests {
     private let teamAMachine = SurfaceMachineID.cloud("vm-team-a")
@@ -22,6 +21,18 @@ struct SurfaceOwnershipPolicyCrossTeamTests {
         #expect(teamAWorkspace.rejection(for: [teamBTerminal]) == .cloudMachineMismatch)
     }
 
+    @Test("Browser resources are portable, but cannot carry a foreign terminal through the gate")
+    func portableBrowsers() {
+        let policy = SurfaceOwnershipPolicy(cloudMachine: teamAMachine)
+        for machine in [SurfaceMachineID.local, teamAMachine, teamBMachine] {
+            let browser = SurfaceResourceID(machine: machine, kind: .browser, key: "browser")
+            #expect(policy.rejection(for: [browser]) == nil)
+            let terminal = SurfaceResourceID(machine: teamBMachine, kind: .terminal, key: "terminal")
+            #expect(policy.rejection(for: [browser, terminal]) == .cloudMachineMismatch)
+        }
+        #expect(policy.rejection(for: [SurfaceResourceID]()) == .cloudMachineMismatch)
+    }
+
     @Test("A local workspace accepts surfaces from every team")
     func localWorkspaceAcceptsEveryTeam() {
         let local = SurfaceOwnershipPolicy(cloudMachine: nil)

diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings
@@ -126417,55 +126417,121 @@
         "ar": {
           "stringUnit": {
             "state": "translated",
-            "value": "لا يمكن أن تحتوي مساحات عمل Cloud إلا على الطرفيات والمتصفحات والشاشات التابعة لجهاز Cloud الخاص بها. افتح مساحة عمل محلية وانقل التقسيمات إليها."
+            "value": "لا يمكن أن تحتوي مساحات عمل Cloud إلا على الطرفيات والشاشات التابعة لجهاز Cloud الخاص بها. يمكن نقل علامات تبويب المتصفح بحرية. افتح مساحة عمل محلية لنقل التقسيمات الأخرى إليها."
           }
         },
         "de": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud-Arbeitsbereiche können nur Terminals, Browser und Displays ihres eigenen Cloud-Rechners enthalten. Öffnen Sie einen lokalen Arbeitsbereich und verschieben Sie die Splits dorthin."
+            "value": "Cloud-Arbeitsbereiche können nur Terminals und Displays ihres eigenen Cloud-Rechners enthalten. Browser-Tabs können frei verschoben werden. Öffnen Sie einen lokalen Arbeitsbereich, um andere Splits dorthin zu verschieben."
           }
         },
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud workspaces can only hold terminals, browsers, and displays from their own Cloud machine. Open a local workspace and move the splits there."
+            "value": "Cloud workspaces can only hold terminals and displays from their own Cloud machine. Browser tabs can move freely. Open a local workspace to move other splits there."
           }
         },
         "es": {
           "stringUnit": {
             "state": "translated",
-            "value": "Los espacios de trabajo Cloud solo pueden contener terminales, navegadores y pantallas de su propia máquina Cloud. Abre un espacio de trabajo local y mueve allí las divisiones."
+            "value": "Los espacios de trabajo Cloud solo pueden contener terminales y pantallas de su propia máquina Cloud. Las pestañas del navegador se pueden mover libremente. Abre un espacio de trabajo local para mover allí las otras divisiones."
           }
         },
         "fr": {
           "stringUnit": {
             "state": "translated",
-            "value": "Les espaces de travail Cloud ne peuvent contenir que les terminaux, navigateurs et écrans de leur propre machine Cloud. Ouvrez un espace de travail local et déplacez-y les splits."
+            "value": "Les espaces de travail Cloud ne peuvent contenir que les terminaux et écrans de leur propre machine Cloud. Les onglets du navigateur peuvent être déplacés librement. Ouvrez un espace de travail local pour y déplacer les autres splits."
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud ワークスペースには、同じ Cloud マシンのターミナル、ブラウザ、ディスプレイのみを追加できます。ローカルワークスペースを開いて、スプリットをそこへ移動してください。"
+            "value": "Cloud ワークスペースには、同じ Cloud マシンのターミナルとディスプレイのみを追加できます。ブラウザのタブは自由に移動できます。他のスプリットを移動するには、ローカルワークスペースを開いてください。"
           }
         },
         "ko": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud 작업 공간에는 동일한 Cloud 머신의 터미널, 브라우저 및 디스플레이만 포함할 수 있습니다. 로컬 작업 공간을 열고 스플릿을 그곳으로 이동하세요."
+            "value": "Cloud 작업 공간에는 동일한 Cloud 머신의 터미널과 디스플레이만 포함할 수 있습니다. 브라우저 탭은 자유롭게 이동할 수 있습니다. 다른 스플릿을 이동하려면 로컬 작업 공간을 여세요."
+          }
+        },
+        "bs": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cloud radni prostori mogu sadržavati samo terminale i ekrane s vlastite Cloud mašine. Kartice preglednika mogu se slobodno premještati. Otvorite lokalni radni prostor da premjestite ostale podjele."
+          }
+        },
+        "da": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cloud-arbejdsområder kan kun indeholde terminaler og skærme fra deres egen Cloud-maskine. Browserfaner kan flyttes frit. Åbn et lokalt arbejdsområde for at flytte andre opdelinger dertil."
+          }
+        },
+        "it": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Gli spazi di lavoro Cloud possono contenere solo terminali e schermi della propria macchina Cloud. Le schede del browser possono essere spostate liberamente. Apri uno spazio di lavoro locale per spostare le altre divisioni."
+          }
+        },
+        "km": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "កន្លែងធ្វើការ Cloud អាចមានតែស្ថានីយ និងអេក្រង់ពីម៉ាស៊ីន Cloud របស់វាប៉ុណ្ណោះ។ ផ្ទាំងកម្មវិធីរុករកអាចផ្លាស់ទីដោយសេរី។ បើកកន្លែងធ្វើការមូលដ្ឋាន ដើម្បីផ្លាស់ទីការបែងចែកផ្សេងទៀតទៅទីនោះ។"
+          }
+        },
+        "nb": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cloud-arbeidsområder kan bare inneholde terminaler og skjermer fra sin egen Cloud-maskin. Nettleserfaner kan flyttes fritt. Åpne et lokalt arbeidsområde for å flytte andre oppdelinger dit."
+          }
+        },
+        "pl": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Obszary robocze Cloud mogą zawierać tylko terminale i ekrany z własnej maszyny Cloud. Karty przeglądarki można swobodnie przenosić. Otwórz lokalny obszar roboczy, aby przenieść tam inne podziały."
+          }
+        },
+        "pt-BR": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Os espaços de trabalho Cloud só podem conter terminais e telas da própria máquina Cloud. As abas do navegador podem ser movidas livremente. Abra um espaço de trabalho local para mover as outras divisões para lá."
+          }
+        },
+        "ru": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Рабочие пространства Cloud могут содержать только терминалы и экраны своей Cloud-машины. Вкладки браузера можно свободно перемещать. Откройте локальное рабочее пространство, чтобы переместить туда остальные разделы."
+          }
+        },
+        "th": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "พื้นที่ทำงาน Cloud มีได้เฉพาะเทอร์มินัลและจอแสดงผลจากเครื่อง Cloud ของตนเอง แท็บเบราว์เซอร์ย้ายได้อย่างอิสระ เปิดพื้นที่ทำงานในเครื่องเพื่อย้ายส่วนแบ่งอื่นไปที่นั่น"
+          }
+        },
+        "tr": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Cloud çalışma alanları yalnızca kendi Cloud makinesindeki terminalleri ve ekranları içerebilir. Tarayıcı sekmeleri serbestçe taşınabilir. Diğer bölmeleri taşımak için yerel bir çalışma alanı açın."
+          }
+        },
+        "uk": {
+          "stringUnit": {
+            "state": "translated",
+            "value": "Робочі простори Cloud можуть містити лише термінали й дисплеї власної Cloud-машини. Вкладки браузера можна вільно переміщувати. Відкрийте локальний робочий простір, щоб перемістити туди інші розділи."
           }
         },
         "zh-Hans": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud 工作区只能包含来自同一台 Cloud 机器的终端、浏览器和显示器。打开本地工作区，然后将这些分屏移到那里。"
+            "value": "Cloud 工作区只能包含来自同一台 Cloud 机器的终端和显示器。浏览器标签页可以自由移动。打开本地工作区以移入其他分屏。"
           }
         },
         "zh-Hant": {
           "stringUnit": {
             "state": "translated",
-            "value": "Cloud 工作區只能包含來自同一台 Cloud 機器的終端機、瀏覽器和顯示器。開啟本機工作區，然後將這些分割畫面移到那裡。"
+            "value": "Cloud 工作區只能包含來自同一台 Cloud 機器的終端機和顯示器。瀏覽器分頁可以自由移動。開啟本機工作區以移入其他分割畫面。"
           }
         }
       }

diff --git a/Sources/AppDelegate+DockSurfaceMove.swift b/Sources/AppDelegate+DockSurfaceMove.swift
@@ -41,7 +41,8 @@ extension AppDelegate {
     /// `destinationDock`.
     func canMoveSurfaceIntoDock(sourceTabId: UUID, destinationDock: DockSplitStore) -> Bool {
         guard let source = locateContainerSurface(tabId: sourceTabId) else { return false }
-        return destinationDock.surfaceOwnershipPolicy.rejection(for: machineOwningBonsplitTab(sourceTabId)) == nil && canMoveSurfaceIntoDock(source)
+        return ownershipRejection(forBonsplitTab: sourceTabId, policy: destinationDock.surfaceOwnershipPolicy) == nil
+            && canMoveSurfaceIntoDock(source)
     }
 
     /// Whether the right sidebar (Files / Find / Dock) currently owns input
@@ -170,7 +171,8 @@ extension AppDelegate {
               let destinationWorkspace = destinationManager.tabs.first(where: { $0.id == targetWorkspaceId }) else {
             return false
         }
-        guard destinationWorkspace.surfaceOwnershipPolicy.rejection(for: sourceDock.machineOwningSurface(panelId)) == nil else { return false }
+        guard destinationWorkspace.surfaceOwnershipPolicy.rejection(for: sourceDock.machineOwningSurface(panelId),
+                                                                    kind: AppDelegate.shared?.surfaceResourceKind(for: sourceDock.panels[panelId])) == nil else { return false }
         let resolvedPane = targetPane.flatMap { pane in
             destinationWorkspace.bonsplitController.allPaneIds.first(where: { $0 == pane })
         } ?? destinationWorkspace.bonsplitController.focusedPaneId

diff --git a/Sources/AppDelegate+MoveTabToNewWorkspace.swift b/Sources/AppDelegate+MoveTabToNewWorkspace.swift
@@ -29,7 +29,7 @@ extension AppDelegate {
     func canMoveBonsplitTab(tabId: UUID, toWorkspace targetWorkspaceId: UUID) -> Bool {
         guard locateContainerSurface(tabId: tabId) != nil,
               let destination = workspaceFor(tabId: targetWorkspaceId) else { return false }
-        return destination.surfaceOwnershipPolicy.rejection(for: machineOwningBonsplitTab(tabId)) == nil
+        return ownershipRejection(forBonsplitTab: tabId, policy: destination.surfaceOwnershipPolicy) == nil
     }
 
     func workspaceMoveTargets(forSurface panelId: UUID) -> [WorkspaceMoveTarget] {

diff --git a/Sources/Cloud/Sidebar/CloudTreeOutlineView+Organization.swift b/Sources/Cloud/Sidebar/CloudTreeOutlineView+Organization.swift
@@ -91,7 +91,8 @@ extension CloudTreeOutlineView.Coordinator {
         case .surfaceResources(let group):
             return SurfaceCatalog.shared.ownershipRejection(for: group.resources, policy: policy)
         case .surface:
-            return policy.rejection(for: AppDelegate.shared?.machineOwningBonsplitTab(transfer.tabId))
+            guard let app = AppDelegate.shared else { return policy.rejection(for: nil) }
+            return app.ownershipRejection(forBonsplitTab: transfer.tabId, policy: policy)
         case .vaultSession, .filePreview, .rightSidebarTool:
             return policy.rejection(for: .local)
         }

diff --git a/Sources/DockSplitStore+BrowserActions.swift b/Sources/DockSplitStore+BrowserActions.swift
@@ -23,7 +23,7 @@ extension DockSplitStore {
             : nil
         let resource = keepsCloudRoute ? (record?.resource ?? browser.cloudResourceForDuplication) : nil
         let isCloud = resource?.machine.isLocal == false
-        guard surfaceOwnershipPolicy.rejection(for: machineOwningSurface(panelId)) == nil else { return nil }
+        guard surfaceOwnershipPolicy.rejection(for: machineOwningSurface(panelId), kind: AppDelegate.shared?.surfaceResourceKind(for: browser)) == nil else { return nil }
         guard let anchorIndex = tabs.firstIndex(where: {
             $0.id == anchorTabId
         }),

diff --git a/Sources/Surfaces/AppDelegate+SurfaceOwnership.swift b/Sources/Surfaces/AppDelegate+SurfaceOwnership.swift
@@ -1,8 +1,21 @@
 import Bonsplit
+import CmuxCloud
 import CmuxSurfaceCatalogModel
 import Foundation
 
 extension AppDelegate {
+    func ownershipRejection(forBonsplitTab tabID: UUID, policy: SurfaceOwnershipPolicy) -> SurfaceTransferRejection? {
+        guard let source = locateContainerSurface(tabId: tabID) else { return policy.rejection(for: nil) }
+        switch source {
+        case .workspace(_, let workspace, let panelID, _):
+            return policy.rejection(for: workspace.machineOwningSurface(panelID),
+                                    kind: surfaceResourceKind(for: workspace.panels[panelID]))
+        case .dock(let dock, let panelID):
+            return policy.rejection(for: dock.machineOwningSurface(panelID),
+                                    kind: surfaceResourceKind(for: dock.panels[panelID]))
+        }
+    }
+
     func machineOwningBonsplitTab(_ tabID: UUID) -> SurfaceMachineID? {
         guard let source = locateContainerSurface(tabId: tabID) else { return nil }
         switch source {
@@ -13,3 +26,21 @@ extension AppDelegate {
         }
     }
 }
+
+extension AppDelegate {
+    /// Resource identity takes precedence over the view used to render it. A
+    /// remote display is carried by a browser panel, but is not a portable tab.
+    func surfaceResourceKind(for panel: (any Panel)?) -> SurfaceResourceKind? {
+        guard let panel else { return nil }
+        if let resource = SurfaceCatalog.shared.projectionRecord(forPanel: panel.id)?.resource {
+            return resource.kind
+        }
+        if let deferred = panel as? DeferredBrowserPanel {
+            return deferred.sessionPanelSnapshot.browser?.cloudResource?.kind
+        }
+        if let browser = panel as? BrowserPanel, let resource = browser.cloudAccess.resourceID {
+            return resource.kind
+        }
+        return panel.panelType == .terminal ? .terminal : nil
+    }
+}
diff --git a/Sources/Surfaces/DockSplitStore+SurfaceOwnership.swift b/Sources/Surfaces/DockSplitStore+SurfaceOwnership.swift
@@ -27,7 +27,8 @@ extension DockSplitStore {
             guard transfer.isFromCurrentProcess else { return ownershipPolicy.rejection(for: nil) }
             // A Dock surface split or reordered within this Dock stays on its machine.
             if surfaceIdToPanelId[TabID(uuid: transfer.tabId)] != nil { return nil }
-            return ownershipPolicy.rejection(for: AppDelegate.shared?.machineOwningBonsplitTab(transfer.tabId))
+            guard let app = AppDelegate.shared else { return ownershipPolicy.rejection(for: nil) }
+            return app.ownershipRejection(forBonsplitTab: transfer.tabId, policy: ownershipPolicy)
         case .vaultSession, .filePreview, .rightSidebarTool:
             return ownershipPolicy.rejection(for: .local)
         }
@@ -37,12 +38,12 @@ extension DockSplitStore {
         if transfer.origin == .dock(workspaceId) { return true }
         return surfaceOwnershipPolicy.rejection(for: transfer.surfaceMachine
             ?? SurfaceCatalog.shared.machineOwningPanel(transfer.panelId)
-            ?? transfer.panel.transferredSurfaceMachine) == nil
+            ?? transfer.panel.transferredSurfaceMachine, kind: AppDelegate.shared?.surfaceResourceKind(for: transfer.panel)) == nil
     }
 
     func acceptsRestoredDisplay(_ snapshot: SessionPanelSnapshot) -> Bool {
         if let resource = snapshot.browser?.cloudResource {
-            return surfaceOwnershipPolicy.rejection(for: resource.machine) == nil
+            return surfaceOwnershipPolicy.rejection(for: resource.machine, kind: resource.kind) == nil
         }
         if let raw = snapshot.browser?.urlString, URL(string: raw)?.path == "/vnc.html" {
             return scope == .global || surfaceOwnershipPolicy.rejection(for: nil) == nil