Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(lume): refresh live folder shares (#2649)

Francesco Bonacci1be5ca1e6044
diff --git a/libs/lume/src/Virtualization/VMVirtualizationService.swift b/libs/lume/src/Virtualization/VMVirtualizationService.swift
index 59a2cdf90a..030ad98f58 100644
--- a/libs/lume/src/Virtualization/VMVirtualizationService.swift
+++ b/libs/lume/src/Virtualization/VMVirtualizationService.swift
@@ -175,7 +175,10 @@ class BaseVirtualizationService: VMVirtualizationService {
"The VM was not started with a live shared-folder device"))
return
}
- device.share = Self.createDirectoryShare(sharedDirectories)
+ device.share = Self.createDirectoryShare(
+ sharedDirectories,
+ withLiveUpdatePlaceholder: true
+ )
continuation.resume()
}
}
@@ -273,21 +276,39 @@ class BaseVirtualizationService: VMVirtualizationService {
return network
}
- static func createDirectorySharingDevices(sharedDirectories: [SharedDirectory]?)
+ static func createDirectorySharingDevices(
+ sharedDirectories: [SharedDirectory]?,
+ withLiveUpdatePlaceholder: Bool = false
+ )
-> [VZDirectorySharingDeviceConfiguration]
{
let grouped = Dictionary(grouping: sharedDirectories ?? [], by: \.tag)
+ let automountTag = VZVirtioFileSystemDeviceConfiguration.macOSGuestAutomountTag
return grouped.map { tag, directories in
let device = VZVirtioFileSystemDeviceConfiguration(tag: tag)
- device.share = createDirectoryShare(directories)
+ device.share = createDirectoryShare(
+ directories,
+ withLiveUpdatePlaceholder: withLiveUpdatePlaceholder && tag == automountTag
+ )
return device
}
}
nonisolated static func createDirectoryShare(
- _ sharedDirectories: [SharedDirectory]
+ _ sharedDirectories: [SharedDirectory],
+ withLiveUpdatePlaceholder: Bool = false
) -> VZDirectoryShare {
var directories: [String: VZSharedDirectory] = [:]
+ if withLiveUpdatePlaceholder {
+ // Live updates work reliably when VZMultipleDirectoryShare starts populated.
+ // Starting macOS with an entirely empty share leaves its automounted
+ // VirtioFS root stale after the first update. Keep one hidden, harmless
+ // entry so replacing the share invalidates the guest mount correctly.
+ directories[".lume-live-share"] = VZSharedDirectory(
+ url: URL(fileURLWithPath: "/var/empty", isDirectory: true),
+ readOnly: true
+ )
+ }
for sharedDirectory in sharedDirectories {
let url = URL(fileURLWithPath: sharedDirectory.hostPath)
let directory = VZSharedDirectory(url: url, readOnly: sharedDirectory.readOnly)
@@ -443,16 +464,18 @@ final class DarwinVirtualizationService: BaseVirtualizationService {
}
}
- // Directory sharing. Keep an empty macOS automount device available so the
- // native toolbar can replace its share while the VM is running.
+ // Directory sharing. Keep a populated macOS automount device available so
+ // the native toolbar can replace its share while the VM is running.
var directorySharingDevices = createDirectorySharingDevices(
- sharedDirectories: config.sharedDirectories)
+ sharedDirectories: config.sharedDirectories,
+ withLiveUpdatePlaceholder: true
+ )
let automountTag = VZVirtioFileSystemDeviceConfiguration.macOSGuestAutomountTag
if !directorySharingDevices.contains(where: {
($0 as? VZVirtioFileSystemDeviceConfiguration)?.tag == automountTag
}) {
let device = VZVirtioFileSystemDeviceConfiguration(tag: automountTag)
- device.share = createDirectoryShare([])
+ device.share = createDirectoryShare([], withLiveUpdatePlaceholder: true)
directorySharingDevices.append(device)
}
vzConfig.directorySharingDevices = directorySharingDevices
diff --git a/libs/lume/tests/VMVirtualizationServiceTests.swift b/libs/lume/tests/VMVirtualizationServiceTests.swift
index ede73af384..7e97b6d613 100644
--- a/libs/lume/tests/VMVirtualizationServiceTests.swift
+++ b/libs/lume/tests/VMVirtualizationServiceTests.swift
@@ -72,7 +72,7 @@ func testVMVirtualizationServiceFailures() async throws {
}
@MainActor
-@Test("Shared directories with one tag use a disambiguated multiple-directory share")
+@Test("macOS automount directories keep a live-update placeholder and disambiguate names")
func testSharedDirectoryGrouping() throws {
let tag = VZVirtioFileSystemDeviceConfiguration.macOSGuestAutomountTag
let sharedDirectories = [
@@ -81,7 +81,8 @@ func testSharedDirectoryGrouping() throws {
]
let devices = BaseVirtualizationService.createDirectorySharingDevices(
- sharedDirectories: sharedDirectories
+ sharedDirectories: sharedDirectories,
+ withLiveUpdatePlaceholder: true
)
let device = try #require(devices.first as? VZVirtioFileSystemDeviceConfiguration)
let share = try #require(device.share as? VZMultipleDirectoryShare)
@@ -89,7 +90,38 @@ func testSharedDirectoryGrouping() throws {
#expect(devices.count == 1)
#expect(device.tag == tag)
let names = Swift.Set<String>(share.directories.keys)
- #expect(names == Swift.Set(["Shared", "Shared (2)"]))
+ #expect(names == Swift.Set([".lume-live-share", "Shared", "Shared (2)"]))
+ #expect(share.directories[".lume-live-share"]?.isReadOnly == true)
+ #expect(share.directories[".lume-live-share"]?.url.path == "/var/empty")
#expect(share.directories["Shared"]?.isReadOnly == false)
#expect(share.directories["Shared (2)"]?.isReadOnly == true)
-}
\ No newline at end of file
+}
+
+@MainActor
+@Test("Only live macOS automount shares receive the placeholder")
+func testLiveSharePlaceholderScope() throws {
+ let tag = VZVirtioFileSystemDeviceConfiguration.macOSGuestAutomountTag
+ let automountShare = try #require(
+ BaseVirtualizationService.createDirectoryShare(
+ [],
+ withLiveUpdatePlaceholder: true
+ ) as? VZMultipleDirectoryShare
+ )
+ let regularShare = try #require(
+ BaseVirtualizationService.createDirectoryShare([]) as? VZMultipleDirectoryShare
+ )
+
+ #expect(Swift.Set(automountShare.directories.keys) == [".lume-live-share"])
+ #expect(regularShare.directories.isEmpty)
+
+ let regularDevices = BaseVirtualizationService.createDirectorySharingDevices(
+ sharedDirectories: [
+ SharedDirectory(hostPath: "/tmp/regular", tag: tag, readOnly: false)
+ ]
+ )
+ let regularDevice = try #require(
+ regularDevices.first as? VZVirtioFileSystemDeviceConfiguration
+ )
+ let regularDeviceShare = try #require(regularDevice.share as? VZMultipleDirectoryShare)
+ #expect(regularDeviceShare.directories[".lume-live-share"] == nil)
+}