Skip to content

Plus menu: one New Cloud VM item that opens the New Machine sheet #11603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lawrencecchen merged 1 commit into from
Sep 2, 2026
Merged

Plus menu: one New Cloud VM item that opens the New Machine sheet #11603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65711,23 +65711,6 @@
}
}
},
"command.cloudVM.advanced.title": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "Advanced"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "詳細"
}
}
}
},
"command.cloudVM.current.missing.message": {
"extractionState": "manual",
"localizations": {
Expand Down Expand Up @@ -66000,6 +65983,23 @@
}
}
},
"command.cloudVM.new.title": {
"extractionState": "manual",
"localizations": {
"en": {
"stringUnit": {
"state": "translated",
"value": "New Cloud VM"
}
},
"ja": {
"stringUnit": {
"state": "translated",
"value": "新しい Cloud VM"
}
}
}
},
"command.cloudVM.newMachine.title": {
"extractionState": "manual",
"localizations": {
Expand Down
93 changes: 9 additions & 84 deletions Sources/Update/TitlebarCloudVMButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,26 +386,11 @@ struct TitlebarCloudVMButton: View {
@MainActor
static func appendCloudVMMenuItems(to menu: NSMenu) {
menu.addItem(mouseDownMenuItem(
title: String(localized: "command.cloudVM.open.title", defaultValue: "Open Base"),
title: String(localized: "command.cloudVM.new.title", defaultValue: "New Cloud VM"),
action: {
CloudVMMenuTarget.shared.open()
CloudVMMenuTarget.shared.newMachine()
}
))
menu.addItem(NSMenuItem.separator())
menu.addItem(menuItem(
title: String(localized: "command.cloudVM.fork.title", defaultValue: "Fork Cloud VM"),
action: #selector(CloudVMMenuTarget.fork)
))
menu.addItem(menuItem(
title: String(localized: "command.cloudVM.snapshot.title", defaultValue: "Checkpoint Cloud VM"),
action: #selector(CloudVMMenuTarget.snapshot)
))
menu.addItem(menuItem(
title: String(localized: "command.cloudVM.restore.title", defaultValue: "Restore Checkpoint..."),
action: #selector(CloudVMMenuTarget.restore)
))
menu.addItem(NSMenuItem.separator())
menu.addItem(advancedMenuItem())
}

private static func menuItem(title: String, action: Selector) -> NSMenuItem {
Expand All @@ -415,81 +400,21 @@ struct TitlebarCloudVMButton: View {
}

private static func mouseDownMenuItem(title: String, action: @escaping () -> Void) -> NSMenuItem {
let item = menuItem(title: title, action: #selector(CloudVMMenuTarget.open))
let item = menuItem(title: title, action: #selector(CloudVMMenuTarget.newMachine))
item.view = MouseDownMenuItemView(title: title, action: action)
return item
}

private static func advancedMenuItem() -> NSMenuItem {
let item = NSMenuItem(
title: String(localized: "command.cloudVM.advanced.title", defaultValue: "Advanced"),
action: nil,
keyEquivalent: ""
)
let submenu = NSMenu()
submenu.addItem(menuItem(
title: String(localized: "command.cloudVM.status.title", defaultValue: "Status"),
action: #selector(CloudVMMenuTarget.status)
))
submenu.addItem(menuItem(
title: String(localized: "command.cloudVM.ports.title", defaultValue: "Ports"),
action: #selector(CloudVMMenuTarget.ports)
))
submenu.addItem(NSMenuItem.separator())
submenu.addItem(menuItem(
title: String(localized: "command.cloudVM.promoteTemplate.title", defaultValue: "Promote to Template"),
action: #selector(CloudVMMenuTarget.promoteTemplate)
))
submenu.addItem(menuItem(
title: String(localized: "command.cloudVM.tools.title", defaultValue: "Inspect Tools"),
action: #selector(CloudVMMenuTarget.tools)
))
submenu.addItem(menuItem(
title: String(localized: "command.cloudVM.handoff.title", defaultValue: "Agent Handoff"),
action: #selector(CloudVMMenuTarget.handoff)
))
item.submenu = submenu
return item
}
}

@MainActor
private final class CloudVMMenuTarget: NSObject {
static let shared = CloudVMMenuTarget()

@objc func open() {
_ = AppDelegate.shared?.performCloudVMAction(debugSource: "titlebar.cloudVM.menu.open")
}

@objc func fork() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.fork, debugSource: "titlebar.cloudVM.menu.fork")
}

@objc func snapshot() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.snapshot, debugSource: "titlebar.cloudVM.menu.snapshot")
}

@objc func restore() {
_ = AppDelegate.shared?.performCloudVMRestoreCommand(debugSource: "titlebar.cloudVM.menu.restore")
}

@objc func promoteTemplate() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.promoteTemplate, debugSource: "titlebar.cloudVM.menu.promoteTemplate")
}

@objc func status() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.status, debugSource: "titlebar.cloudVM.menu.status")
}

@objc func ports() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.ports, debugSource: "titlebar.cloudVM.menu.ports")
}

@objc func tools() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.tools, debugSource: "titlebar.cloudVM.menu.tools")
}

@objc func handoff() {
_ = AppDelegate.shared?.performCurrentCloudVMCommand(.handoff, debugSource: "titlebar.cloudVM.menu.handoff")
/// Same path as the Machines panel ＋ button and the command palette: the
/// New Machine sheet, with the plan meter read from the fleet page first.
@objc func newMachine() {
NewMachineSheetPresenter.shared.presentNewMachineFetchingPlan(
preferredWindow: NSApp.keyWindow ?? NSApp.mainWindow
)
}
}
2 changes: 1 addition & 1 deletion cmuxTests/CmuxConfigNewWorkspaceMenuTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ struct CmuxConfigNewWorkspaceMenuTests {
))
#expect(!store.newWorkspaceContextMenuIsConfigured)
#expect(store.newWorkspaceMenuSectionOrder == .cloudFirst)
let cloudOpenTitle = String(localized: "command.cloudVM.open.title", defaultValue: "Open Base")
let cloudOpenTitle = String(localized: "command.cloudVM.new.title", defaultValue: "New Cloud VM")
let cloudOpenIndex = try #require(menu.items.firstIndex { item in
!item.isSeparatorItem && item.title == cloudOpenTitle
})
Expand Down