Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.
Rust agentai-agentapplecomputer-usecomputer-use-agentcontainerizationcuadesktop-automationhacktoberfestlumemacosmanusoperatorswiftvirtualizationvirtualization-frameworkwindowswindows-sandbox
fix(lume): distinguish running VMs from resize recovery
Francesco Bonacci9a02db498e17
diff --git a/libs/lume/src/Errors/Errors.swift b/libs/lume/src/Errors/Errors.swiftindex 498038d038..0e280ae54a 100644--- a/libs/lume/src/Errors/Errors.swift+++ b/libs/lume/src/Errors/Errors.swift@@ -253,7 +253,7 @@ enum DiskResizeError: Error, LocalizedError {var errorDescription: String? {switch self {case .vmRunning(let name):- return "Cannot resize the disk of \(name): the VM is running. Stop it first."+ return "Cannot modify \(name): the VM is running. Stop it first."case .resizeInProgress(let name):return"A previous disk resize of \(name) did not finish. Re-run the same command to roll it back and restore the disk from its backup."diff --git a/libs/lume/src/LumeController.swift b/libs/lume/src/LumeController.swiftindex 2790677503..f5989f6ece 100644--- a/libs/lume/src/LumeController.swift+++ b/libs/lume/src/LumeController.swift@@ -279,6 +279,14 @@ final class LumeController {}}+ /// Classifies resize-guard contention using the transaction marker as the+ /// authoritative signal. A running VM intentionally holds the guard for+ /// its lifetime, so lock contention without a marker is not an interrupted+ /// resize and must not suggest rollback.+ private func resizeGuardContentionError(_ vmDir: VMDirectory, name: String) -> DiskResizeError {+ vmDir.hasResizeMarker() ? .resizeInProgress(name) : .vmRunning(name)+ }+@MainActorpublic func clone(name: String, newName: String, sourceLocation: String? = nil, destLocation: String? = nil@@ -301,7 +309,7 @@ final class LumeController {// Check if source VM is still being provisionedlet sourceVmDir = try home.getVMDirectory(normalizedName, storage: actualSourceLocation)guard let resizeGuard = try sourceVmDir.tryAcquireResizeGuard(exclusive: false) else {- throw DiskResizeError.resizeInProgress(normalizedName)+ throw resizeGuardContentionError(sourceVmDir, name: normalizedName)}defer {flock(resizeGuard.fileDescriptor, LOCK_UN)@@ -313,7 +321,7 @@ final class LumeController {let destinationVmDir = try home.getVMDirectory(normalizedNewName, storage: destLocation)guard let destinationGuard = try destinationVmDir.tryAcquireResizeGuard(exclusive: true)else {- throw DiskResizeError.resizeInProgress(normalizedNewName)+ throw resizeGuardContentionError(destinationVmDir, name: normalizedNewName)}defer {flock(destinationGuard.fileDescriptor, LOCK_UN)@@ -909,7 +917,7 @@ final class LumeController {}guard let resizeGuard = try vmDir.tryAcquireResizeGuard(exclusive: true) else {- throw DiskResizeError.resizeInProgress(normalizedName)+ throw resizeGuardContentionError(vmDir, name: normalizedName)}defer {flock(resizeGuard.fileDescriptor, LOCK_UN)@@ -1320,7 +1328,7 @@ final class LumeController {// Get the VM directorylet vmDir = try home.getVMDirectory(name, storage: actualLocation)guard let resizeGuard = try vmDir.tryAcquireResizeGuard(exclusive: false) else {- throw DiskResizeError.resizeInProgress(name)+ throw resizeGuardContentionError(vmDir, name: name)}defer {flock(resizeGuard.fileDescriptor, LOCK_UN)diff --git a/libs/lume/tests/LumeControllerTests.swift b/libs/lume/tests/LumeControllerTests.swiftindex e5834e7e54..c4514373f7 100644--- a/libs/lume/tests/LumeControllerTests.swift+++ b/libs/lume/tests/LumeControllerTests.swift@@ -164,6 +164,83 @@ func testClonePreservesPairedBootPolicyState() throws {#expect(cloneConfig.macAddress != sourceMacAddress)}+@MainActor+@Test("delete classifies resize guard contention using the transaction marker")+func testDeleteClassifiesResizeGuardContentionWithoutMarkerAsRunning() async throws {+ let tempConfigDir = try createTempDirectory()+ let tempHomeDir = try createTempDirectory()++ defer {+ try? FileManager.default.removeItem(at: tempConfigDir)+ try? FileManager.default.removeItem(at: tempHomeDir)+ }++ let previousXDGConfigHome = ProcessInfo.processInfo.environment["XDG_CONFIG_HOME"]+ setenv("XDG_CONFIG_HOME", tempConfigDir.path, 1)+ defer {+ if let previousXDGConfigHome {+ setenv("XDG_CONFIG_HOME", previousXDGConfigHome, 1)+ } else {+ unsetenv("XDG_CONFIG_HOME")+ }+ }++ let settingsManager = SettingsManager(fileManager: .default)+ try settingsManager.setHomeDirectory(path: tempHomeDir.path)+ let home = Home(settingsManager: settingsManager, fileManager: .default)+ let controller = LumeController(home: home, vmFactory: TestVMFactory())+ let vmDir = try home.getVMDirectory("running-guard")+ try FileManager.default.createDirectory(+ at: vmDir.dir.url,+ withIntermediateDirectories: true+ )+ try Data(repeating: 0, count: 1024).write(to: vmDir.diskPath.url)+ try Data(repeating: 0, count: 1024).write(to: vmDir.nvramPath.url)+ try vmDir.saveConfig(+ VMConfig(+ os: "macOS",+ cpuCount: 1,+ memorySize: 1024,+ diskSize: 1024,+ display: "1024x768"+ ))++ let acquired = try vmDir.tryAcquireResizeGuard(exclusive: false)+ let resizeGuard = try #require(acquired)+ defer {+ flock(resizeGuard.fileDescriptor, LOCK_UN)+ try? resizeGuard.close()+ }++ do {+ try await controller.delete(name: vmDir.name)+ Issue.record("Expected delete to reject a VM holding the resize guard")+ } catch DiskResizeError.vmRunning(let name) {+ #expect(name == vmDir.name)+ } catch {+ Issue.record("Expected vmRunning but got \(error)")+ }++ try vmDir.saveResizeMarker(+ ResizeMarker(+ version: ResizeMarker.currentVersion,+ phase: 1,+ oldSizeBytes: 1024,+ newSizeBytes: 2048,+ backupDiskPath: vmDir.diskBackupPath.path,+ startedAt: 0+ ))++ do {+ try await controller.delete(name: vmDir.name)+ Issue.record("Expected delete to reject an armed resize transaction")+ } catch DiskResizeError.resizeInProgress(let name) {+ #expect(name == vmDir.name)+ } catch {+ Issue.record("Expected resizeInProgress but got \(error)")+ }+}+@MainActor@Test("run rejects primary and duplicate additional disk aliases")func testRunRejectsAdditionalDiskAliases() async throws {