Skip to content

The ultimate harness for coding agents and beyond. All your agents. All your machines. One command center. Start with code, then follow your curiosity and build across disciplines: CAD, circuits, robots, games and music.

Separate New and Open Harness titlebar actions

deee8960fc9e7b2
diff --git a/desktop/lib/shortcuts/keymap_commands.dart b/desktop/lib/shortcuts/keymap_commands.dart
index e8a3d1f64..43d54ee5e 100644
--- a/desktop/lib/shortcuts/keymap_commands.dart
+++ b/desktop/lib/shortcuts/keymap_commands.dart
@@ -270,7 +270,7 @@ final harnessCommands = <HarnessCommand>[
),
const HarnessCommand(
'agent.add',
- 'Find Harness',
+ 'Open Harness',
ShortcutGroup.actions,
action: ShortcutAction.addAgent,
nativeAction: 'addAgent',
diff --git a/desktop/macos/Runner/SwarmTitlebar.swift b/desktop/macos/Runner/SwarmTitlebar.swift
index f7534e63f..c2ac800dd 100644
--- a/desktop/macos/Runner/SwarmTitlebar.swift
+++ b/desktop/macos/Runner/SwarmTitlebar.swift
@@ -115,6 +115,10 @@ final class SwarmTitlebar: NSObject, NSMenuItemValidation, NSMenuDelegate {
keymap = map
let hint = map.hint(for: "swarm.new", context: "workspace")
strip.newButton.toolTip = hint.map { "New Tab (\($0))" } ?? "New Tab"
+ strip.createButton.toolTip = map.hint(for: "agent.new", context: "workspace")
+ .map { "New Harness (\($0))" } ?? "New Harness"
+ strip.openButton.toolTip = map.hint(for: "agent.add", context: "workspace")
+ .map { "Open Harness (\($0))" } ?? "Open Harness"
if let main = NSApp.mainMenu, let window {
let menu = main as? HarnessKeymapMenu ?? HarnessKeymapMenu.replacing(main)
if NSApp.mainMenu !== menu { NSApp.mainMenu = menu }
@@ -202,7 +206,7 @@ final class SwarmTitlebar: NSObject, NSMenuItemValidation, NSMenuDelegate {
let file = NSMenu(title: "File")
add(file, "New Tab", "t", "new")
add(file, "New Harness…", "n", "newAgent")
- add(file, "Find Harness…", "o", "addAgent")
+ add(file, "Open Harness…", "o", "addAgent")
add(file, "Rename Harness…", "r", "renameActive", [.command, .shift])
add(file, "Close Harness", "w", "closeActive")
file.addItem(.separator())
@@ -715,6 +719,40 @@ private final class SwarmNotificationButton: NSButton {
}
}
+/// Keep titlebar actions on the app's palette. AppKit's rounded bezel chooses
+/// its own label color in active/inactive windows, ignoring contentTintColor.
+private final class SwarmActionButton: NSButton {
+ var fillColor = NSColor.clear { didSet { needsDisplay = true } }
+ var labelColor = NSColor.labelColor { didSet { needsDisplay = true } }
+ private var hovered = false
+ override var isEnabled: Bool { didSet { needsDisplay = true } }
+ override var mouseDownCanMoveWindow: Bool { false }
+
+ override func updateTrackingAreas() {
+ super.updateTrackingAreas()
+ trackingAreas.forEach(removeTrackingArea)
+ addTrackingArea(NSTrackingArea(rect: .zero,
+ options: [.mouseEnteredAndExited, .activeAlways, .inVisibleRect], owner: self))
+ }
+ override func mouseEntered(with event: NSEvent) { hovered = true; needsDisplay = true }
+ override func mouseExited(with event: NSEvent) { hovered = false; needsDisplay = true }
+
+ override func draw(_ dirtyRect: NSRect) {
+ let opacity: CGFloat = isEnabled ? 1 : 0.35
+ let fill = isEnabled && (hovered || isHighlighted)
+ ? fillColor.blended(withFraction: isHighlighted ? 0.16 : 0.08, of: labelColor) ?? fillColor
+ : fillColor
+ fill.withAlphaComponent(opacity).setFill()
+ NSBezierPath(roundedRect: bounds, xRadius: 6, yRadius: 6).fill()
+ let label = NSAttributedString(string: title, attributes: [
+ .font: font ?? NSFont.systemFont(ofSize: 12, weight: .medium),
+ .foregroundColor: labelColor.withAlphaComponent(opacity),
+ ])
+ let size = label.size()
+ label.draw(at: NSPoint(x: (bounds.width - size.width) / 2, y: (bounds.height - size.height) / 2))
+ }
+}
+
private final class SwarmTabStrip: NSView {
private(set) var palette = SwarmNativePalette()
var emit: ((String, Any?) -> Void)?
@@ -722,6 +760,8 @@ private final class SwarmTabStrip: NSView {
private let document = NSView()
fileprivate let newButton = NSButton()
fileprivate let notificationButton = SwarmNotificationButton()
+ fileprivate let createButton = SwarmActionButton()
+ fileprivate let openButton = SwarmActionButton()
private var tabs: [SwarmTabButton] = []
private let icons = SwarmHistoryIcons()
private var activeId = ""
@@ -757,6 +797,22 @@ private final class SwarmTabStrip: NSView {
newButton.isEnabled = false
button(notificationButton, "bell", "Notifications", #selector(openNotifications))
notificationButton.isEnabled = false
+ func textButton(_ button: NSButton, _ label: String, _ action: Selector) {
+ button.title = label
+ button.font = .systemFont(ofSize: 12, weight: .medium)
+ button.isBordered = false
+ button.setButtonType(.momentaryChange)
+ button.target = self
+ button.action = action
+ button.toolTip = label
+ button.setAccessibilityLabel(label)
+ button.isEnabled = false
+ addSubview(button)
+ }
+ textButton(createButton, "New Harness", #selector(createHarness))
+ textButton(openButton, "Open Harness", #selector(openHarness))
+ updateActionColors()
+ setAccessibilityChildren([notificationButton, scroll, newButton, createButton, openButton])
registerForDraggedTypes([swarmPasteboardType])
}
required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") }
@@ -767,10 +823,18 @@ private final class SwarmTabStrip: NSView {
palette = nextPalette
notificationButton.contentTintColor = palette.accent
newButton.contentTintColor = palette.accent
+ updateActionColors()
for tab in tabs { tab.palette = palette }
needsDisplay = true
}
+ private func updateActionColors() {
+ createButton.fillColor = palette.accent
+ createButton.labelColor = palette.tabBar
+ openButton.fillColor = palette.search
+ openButton.labelColor = palette.accent
+ }
+
func update(_ state: [String: Any]) {
// Workspace teardown clears its controls without changing appearance.
if let palette = state["palette"] as? [String: Any] { updatePalette(palette) }
@@ -813,6 +877,8 @@ private final class SwarmTabStrip: NSView {
document.setAccessibilityChildren(tabs)
newButton.isEnabled = actionsEnabled && tabs.count < 24
notificationButton.isEnabled = actionsEnabled
+ createButton.isEnabled = actionsEnabled
+ openButton.isEnabled = actionsEnabled
let attention = state["attention"] as? Int ?? 0
notificationButton.hasAttention = attention > 0
notificationButton.toolTip = attention > 0 ? "\(attention) harnesses need input" : "Notifications"
@@ -838,18 +904,23 @@ private final class SwarmTabStrip: NSView {
let activeWasVisible = active.map { scroll.documentVisibleRect.intersects($0.frame) } ?? false
let previousScrollSize = scroll.frame.size
let previousDocumentSize = document.frame.size
- let available = max(132, bounds.width - 84)
- let width = min(220, max(132, available / CGFloat(max(1, tabs.count))))
+ let leading: CGFloat = 36
+ let actionsWidth: CGFloat = 232
+ newButton.isHidden = bounds.width < 420
+ let available = max(32, bounds.width - leading - actionsWidth - (newButton.isHidden ? 0 : 36))
+ let width = min(220, max(min(132, available), available / CGFloat(max(1, tabs.count))))
let occupied = min(available, CGFloat(tabs.count) * width)
- scroll.frame = NSRect(x: 0, y: 0, width: occupied, height: bounds.height)
+ scroll.frame = NSRect(x: leading, y: 0, width: occupied, height: bounds.height)
document.frame = NSRect(x: 0, y: 0, width: max(occupied, CGFloat(tabs.count) * width), height: bounds.height)
for (index, tab) in tabs.enumerated() {
tab.frame = NSRect(x: CGFloat(index) * width, y: 0, width: width, height: bounds.height - 6)
tab.contentCenterY = bounds.midY
}
let buttonY = (bounds.height - 28) / 2
- newButton.frame = NSRect(x: occupied + 4, y: buttonY, width: 28, height: 28)
- notificationButton.frame = NSRect(x: bounds.width - 40, y: buttonY, width: 28, height: 28)
+ notificationButton.frame = NSRect(x: 0, y: buttonY, width: 28, height: 28)
+ newButton.frame = NSRect(x: leading + occupied + 4, y: buttonY, width: 28, height: 28)
+ createButton.frame = NSRect(x: bounds.width - actionsWidth, y: buttonY, width: 106, height: 28)
+ openButton.frame = NSRect(x: bounds.width - 116, y: buttonY, width: 108, height: 28)
let geometryChanged = scroll.frame.size != previousScrollSize || document.frame.size != previousDocumentSize
if let active, revealActiveAfterLayout || (activeWasVisible && (geometryChanged || tabOrderChanged)) {
document.scrollToVisible(active.frame)
@@ -888,6 +959,12 @@ private final class SwarmTabStrip: NSView {
@objc private func openNotifications() {
if actionsEnabled { emit?("notifications", nil) }
}
+ @objc private func createHarness() {
+ if actionsEnabled { emit?("newAgent", nil) }
+ }
+ @objc private func openHarness() {
+ if actionsEnabled { emit?("addAgent", nil) }
+ }
private func draggedTab(_ sender: NSDraggingInfo) -> SwarmTabButton? {
guard actionsEnabled, sender.draggingSourceOperationMask.contains(.move),
diff --git a/desktop/tool/swarm_titlebar_checks.swift b/desktop/tool/swarm_titlebar_checks.swift
index a64ef64d6..d87c9e2d4 100644
--- a/desktop/tool/swarm_titlebar_checks.swift
+++ b/desktop/tool/swarm_titlebar_checks.swift
@@ -151,12 +151,20 @@ private extension SwarmTabStrip {
try original.checkAccessibility(expectedName: "Renamed tab", active: true)
try checkTitlebar(newButton.isEnabled, "New Harness returns below capacity")
try checkTitlebar(newButton.toolTip?.contains("⌘T") == true, "New Harness advertises its keyboard shortcut")
- try checkTitlebar(newButton.frame.maxX < notificationButton.frame.minX, "New Harness and the bell have separate targets")
+ try checkTitlebar(notificationButton.frame.maxX <= scroll.frame.minX,
+ "The bell is before the tabs beside the traffic lights")
+ try checkTitlebar((newButton.isHidden || newButton.frame.maxX <= createButton.frame.minX) && scroll.frame.maxX <= createButton.frame.minX && createButton.frame.maxX < openButton.frame.minX,
+ "New and Open Harness have separate targets on the right")
+ try checkTitlebar(createButton.title == "New Harness" && openButton.title == "Open Harness",
+ "Creation and opening are explicit in the titlebar")
try checkTitlebar(!subviews.contains(where: { $0 is NSTextField }), "The titlebar has no competing text editor")
events.removeAll()
newButton.performClick(nil)
notificationButton.performClick(nil)
- try checkTitlebar(events == ["new", "notifications"], "Each toolbar icon opens its shared Flutter surface once")
+ createButton.performClick(nil)
+ openButton.performClick(nil)
+ try checkTitlebar(events == ["new", "notifications", "newAgent", "addAgent"],
+ "The new tab, notification, create and open buttons dispatch separate actions once")
try checkTitlebar(notificationButton.hasAttention, "The bell represents pending agent attention")
let oldButton = newButton
var themedState = state([["id": "swarm-0", "name": "Renamed tab"]], active: "swarm-0")
@@ -174,10 +182,12 @@ private extension SwarmTabStrip {
events.removeAll()
update(state([["id": "swarm-0", "name": "Renamed tab"]], active: "swarm-0", enabled: false))
try original.checkEnabled(false)
- try checkTitlebar(!newButton.isEnabled && !notificationButton.isEnabled, "Titlebar actions disable with a modal")
+ try checkTitlebar(!newButton.isEnabled && !notificationButton.isEnabled && !createButton.isEnabled && !openButton.isEnabled, "Titlebar actions disable with a modal")
original.clickBothActions()
newButton.performClick(nil)
notificationButton.performClick(nil)
+ createButton.performClick(nil)
+ openButton.performClick(nil)
try checkTitlebar(events.isEmpty, "Disabled controls emit no actions")
try checkDragOperations()
}