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.

Tighten workspace footer spacing and align the daemon (#572)

Dee920237b6479a
diff --git a/desktop/design/desktop-design-system.md b/desktop/design/desktop-design-system.md
index 7f0d2a110..dc7446644 100644
--- a/desktop/design/desktop-design-system.md
+++ b/desktop/design/desktop-design-system.md
@@ -358,15 +358,19 @@ folders count once per machine. See [workspace status bar](workspace-status-bar.
Titles stay quiet when several panes are visible. Do not repeat branches in pane headers or
model/effort in the footer. Context honors the selected status face, fields, colors and shell/
Powerline treatment. Recent-harness context uses its monochrome presentation.
-Use whole figures, one space between title and value, and 2.5 character cells between parts:
+Use whole figures, spaces of 0.75 character cells within components, and two cells between parts:
`Harnesses 118 CPU 20% RAM 10 GB GPU 10% SSD 1 GB Claude 100% Codex 90%`.
Labels and numbers use neutral readable ink; no severity color, dot separators, trailing plus or
-decimal figures. Harness metrics show — when unavailable and ≥ for partial totals. Subscription
-figures mean allowance used and preserve Models' deduplicated accounts, limiting window and
+decimal figures. Harness metrics show — when unavailable; partial totals show the available number
+without a prefix, with coverage explained in the tooltip. Subscription figures mean allowance
+used and preserve Models' deduplicated accounts, limiting window and
freshness rules. Hover explains scope and units. Clicking subscription usage opens Subscriptions
without switching a model. Narrow widths hide complete groups: SSD, then GPU, then RAM.
-Companion and sharing controls follow usage. See the full [status bar contract](workspace-status-bar.md).
+Companion and sharing controls follow usage. The companion uses the same gap between controls as
+the resource and subscription groups; the gutter in its fixed slot replaces the preceding control's
+trailing padding so the artwork has the same visible separation as text. See the full
+[status bar contract](workspace-status-bar.md).
**Settings, Store and supporting screens** — the same type, colors and controls
at page scale. Related settings use grouping and whitespace. Existing artwork,
diff --git a/desktop/design/desktop-ui-migration.md b/desktop/design/desktop-ui-migration.md
index da642c2c2..bda3f7929 100644
--- a/desktop/design/desktop-ui-migration.md
+++ b/desktop/design/desktop-ui-migration.md
@@ -38,6 +38,25 @@ The standalone MachinesManager, old machine-link dialog, and generic
team-creation presenter have no production caller in this tree. They are not
counted as completed user journeys. Shared controls still serve their tests.
+## Footer spacing refinement — 2026-10-02
+
+Resource totals now show their available number without a ≥ prefix; partial
+coverage remains explained in the tooltip. Flutter and AppKit share 0.75-cell
+spaces within components and two-cell gaps between components. The companion's
+existing artwork gutter replaces the preceding control's trailing padding,
+removing the extra visible gap while retaining its fixed 44-point click target.
+
+Production AppKit controls were rendered with synthetic values in
+[dark](images/workspace-footer-compact-dark.png) and
+[light](images/workspace-footer-compact-light.png) appearances at 1280 points,
+plus a 520-point window and 26-point status text. The captures use 2× backing
+resolution; text baselines, visible gaps and narrow truncation were inspected.
+Validation passed: 50 targeted Flutter tests, 4,344 native titlebar checks, and
+static analysis of the four changed Dart files. The native checks exercise
+stable daemon geometry, hover, focus and existing actions. These are isolated
+production-view renders; the installed app and physical VoiceOver were not
+exercised for this refinement.
+
## Notification overview refinement — 2026-10-01
The earlier overview repeated a status caption and tab/machine context under
diff --git a/desktop/design/images/workspace-footer-compact-dark.png b/desktop/design/images/workspace-footer-compact-dark.png
new file mode 100644
index 000000000..085a14e02
Binary files /dev/null and b/desktop/design/images/workspace-footer-compact-dark.png differ
diff --git a/desktop/design/images/workspace-footer-compact-light.png b/desktop/design/images/workspace-footer-compact-light.png
new file mode 100644
index 000000000..3fae204b0
Binary files /dev/null and b/desktop/design/images/workspace-footer-compact-light.png differ
diff --git a/desktop/design/workspace-status-bar.md b/desktop/design/workspace-status-bar.md
index f56286748..3eab7c8a0 100644
--- a/desktop/design/workspace-status-bar.md
+++ b/desktop/design/workspace-status-bar.md
@@ -31,9 +31,11 @@ and machines. Create one only when absent. Clicking does not open a separate res
Saved sessions and open/resume actions belong in Open Harness (Cmd-P). The monitor itself starts
with active sessions, sortable resource and AI metrics, an inspector and a reviewed Stop action.
-Use one space between title and value and 2.5 character cells between complete groups, including
-the count. Adjacent controls contribute one cell of horizontal padding plus half a cell between
-controls. The shared `workspaceBarGroupGapCells` keeps Flutter and native views aligned. Use neutral
+Use spaces of 0.75 character cells within components and two cells between complete groups,
+including the count. Adjacent controls contribute one cell of horizontal padding on each side;
+before the fixed companion slot, omit the preceding control's trailing cell because the artwork
+already has its own optical gutter. Do not add extra separation. The shared `workspaceBarValueGapCells`
+and `workspaceBarGroupGapCells` keep Flutter and native views aligned. Use neutral
workspace ink at every usage level. Do not pad numbers or add dots, decimal figures or plus suffixes.
CPU is the sum of attributable process-tree interval use; 100% is one core, so multicore and fleet
@@ -47,9 +49,10 @@ SSD means allocated workspace disk space, including existing files. Shared and n
folders count once per machine. It is not free space, capacity or a claim that every host uses an
SSD. Stopping a process keeps its files. Directory sizes use bounded reads cached for one minute.
-Unknown readings show —, with valid zero preserved. A partial total is prefixed ≥. The tooltip
-explains scope, units and shared accounting. Samples expire after 45 seconds. The count and resource
-totals cover the same connected owned sessions and never substitute whole-machine utilization.
+Unknown readings show —, with valid zero preserved. Partial totals show the available number without
+a prefix. The tooltip explains partial coverage, scope, units and shared accounting. Samples expire
+after 45 seconds. The count and resource totals cover the same connected owned sessions and never
+substitute whole-machine utilization.
Sample connected owners every fifteen seconds while the app is foregrounded. Clear readings and
stop polling when hidden; refresh on return. Coalesce process samples in the owning daemon, verify
@@ -61,7 +64,9 @@ Native and Flutter footers share data, tooltips and button behavior. At narrow w
then GPU, then RAM as complete groups, keeping CPU and the full tooltip. Subscription usage remains
visible in wide windows and accessible through Models at every size. Preserve focused context.
-![Harness resource footer with synthetic readings](images/harness-monitor-footer.png)
+![Compact footer and companion with synthetic readings, dark](images/workspace-footer-compact-dark.png)
+
+![Compact footer and companion with synthetic readings, light](images/workspace-footer-compact-light.png)
The previous capture below documents spacing; its whole-machine percentages have been superseded:
diff --git a/desktop/lib/screens/swarm_screen.dart b/desktop/lib/screens/swarm_screen.dart
index 6ddf8c5f0..3a56c4c72 100644
--- a/desktop/lib/screens/swarm_screen.dart
+++ b/desktop/lib/screens/swarm_screen.dart
@@ -1792,6 +1792,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
'family': barStyle.fontFamily,
'fallback': barStyle.fontFamilyFallback,
'size': workspaceBarFontSize,
+ 'valueGapCells': workspaceBarValueGapCells,
'groupGapCells': workspaceBarGroupGapCells,
'foreground': terminalTheme.foreground.toARGB32(),
'selection': terminalTheme.selection.toARGB32(),
@@ -7243,7 +7244,11 @@ class _SwarmScreenState extends State<SwarmScreen> {
resourceGap * 2,
);
final monitorWidth = math.min(
- workspaceBarTextSizeOf(context, _harnessMonitor.label).width +
+ workspaceBarTextSizeOf(
+ context,
+ _harnessMonitor.label,
+ grouped: true,
+ ).width +
cell.width * 2,
resourceBudget * .4,
);
@@ -7251,6 +7256,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
final usageWidth = constraints.maxWidth < 1050
? 0.0
: resourceBudget * .22;
+ final hasFooterDaemon = !kIsWeb && _slotShown;
final paneContext = Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
@@ -7314,8 +7320,11 @@ class _SwarmScreenState extends State<SwarmScreen> {
height: workspaceBarControlHeight(context),
child: Center(
widthFactor: 1,
- child: Text(
- _harnessMonitor.label,
+ child: Text.rich(
+ workspaceBarGroupTextSpan(
+ _harnessMonitor.label,
+ cellWidth: cell.width,
+ ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: workspaceBarTextStyle(
@@ -7334,6 +7343,10 @@ class _SwarmScreenState extends State<SwarmScreen> {
child: WorkspaceHarnessResources(
key: const ValueKey('workspace-machine-resources'),
monitor: _harnessMonitor,
+ // The fixed companion slot supplies its own optical gutter.
+ trailingPadding: hasFooterDaemon && usageWidth == 0
+ ? 0
+ : null,
onPressed: _shortcutsEnabled
? _toggleHarnessControls
: null,
@@ -7353,7 +7366,10 @@ class _SwarmScreenState extends State<SwarmScreen> {
)
: null,
builder: (context, emphasized) => Padding(
- padding: EdgeInsets.symmetric(horizontal: cell.width),
+ padding: EdgeInsets.only(
+ left: cell.width,
+ right: hasFooterDaemon ? 0 : cell.width,
+ ),
child: SizedBox(
height: workspaceBarControlHeight(context),
child: Center(
@@ -7384,8 +7400,11 @@ class _SwarmScreenState extends State<SwarmScreen> {
),
),
],
- SizedBox(width: cell.width * 2),
- if (!kIsWeb && _slotShown) _daemonTabButton(),
+ if (hasFooterDaemon) ...[
+ SizedBox(width: resourceGap),
+ _daemonTabButton(),
+ ] else
+ SizedBox(width: cell.width * 2),
if (download) ...[
SizedBox(width: cell.width),
ConstrainedBox(
diff --git a/desktop/lib/shared/theme/workspace_bar_style.dart b/desktop/lib/shared/theme/workspace_bar_style.dart
index 467a78bf4..f3d42008f 100644
--- a/desktop/lib/shared/theme/workspace_bar_style.dart
+++ b/desktop/lib/shared/theme/workspace_bar_style.dart
@@ -8,11 +8,12 @@ import '../../terminal/terminal_typography.dart';
/// SF Mono on macOS, with the platform's monospace stack elsewhere.
const workspaceBarFontSize = 13.0;
-/// One space inside a label–value pair, 2.5 cells between complete components.
+/// Slightly tighter spaces within components, two cells between components.
/// Neighboring controls already contribute one padded cell on either side.
-const workspaceBarGroupGapCells = 2.5;
+const workspaceBarValueGapCells = 0.75;
+const workspaceBarGroupGapCells = 2.0;
-/// Text retains ordinary spaces; rendering uses the measured group gap above.
+/// Text retains ordinary spaces; rendering measures gaps with the shared tokens.
const workspaceBarGroupSeparator = ' ';
TextSpan workspaceBarGroupTextSpan(
@@ -36,7 +37,16 @@ TextSpan workspaceBarGroupTextSpan(
workspaceBarGroupSeparator.length,
),
),
- TextSpan(text: groups[i]),
+ for (final (index, word) in groups[i].split(' ').indexed) ...[
+ if (index > 0)
+ TextSpan(
+ text: ' ',
+ style: TextStyle(
+ letterSpacing: cellWidth * (workspaceBarValueGapCells - 1),
+ ),
+ ),
+ TextSpan(text: word),
+ ],
],
],
);
diff --git a/desktop/lib/state/harness_monitor.dart b/desktop/lib/state/harness_monitor.dart
index fa1981952..cd8be6005 100644
--- a/desktop/lib/state/harness_monitor.dart
+++ b/desktop/lib/state/harness_monitor.dart
@@ -68,7 +68,7 @@ class HarnessMonitor extends ChangeNotifier {
String get label => 'Harnesses ${live.length}';
/// CPU percentages share a denominator (one core), not host capacities.
- /// Missing sessions make a known sum a lower bound, never a complete total.
+ /// Totals include available readings; the tooltip explains partial coverage.
String metricsLabel({bool ram = true, bool gpu = true, bool storage = true}) {
final readings = [...live.map(reading), ...sharedReadings];
String total(
@@ -81,7 +81,7 @@ class HarnessMonitor extends ChangeNotifier {
.toList();
if (readings.isEmpty) return format(0);
if (known.isEmpty) return '—';
- return '${known.length < readings.length ? '≥' : ''}${format(known.fold(0, (a, b) => a + b))}';
+ return format(known.fold(0, (a, b) => a + b));
}
final cpu = total((r) => r.cpuPercent, (v) => '${v.round()}%');
@@ -99,11 +99,9 @@ class HarnessMonitor extends ChangeNotifier {
String _storageLabel() {
final folders = <String, Map<String, double?>>{};
- var missing = false;
for (final row in live) {
final resource = reading(row), path = resource?.workspacePath;
if (path == null || resource?.workspaceBytes == null) {
- missing = true;
continue;
}
(folders[row.machineId] ??= {})[path] = resource!.workspaceBytes;
@@ -125,7 +123,7 @@ class HarnessMonitor extends ChangeNotifier {
}
}
if (live.isNotEmpty && count == 0) return '—';
- return '${missing ? '≥' : ''}${_wholeBytes(bytes)}';
+ return _wholeBytes(bytes);
}
String get resourceDetail =>
@@ -134,7 +132,7 @@ class HarnessMonitor extends ChangeNotifier {
'CPU: 100% is one core. RAM includes child processes and shared servers counted once; shared memory pages can overlap.\n'
'GPU: summed process utilization; can exceed 100% across processes or devices. Unsupported counters are unavailable. Cloud inference is not local GPU usage.\n'
'SSD: workspace disk space, shared and nested folders counted once per machine. Files remain after stopping.\n'
- '≥ means a partial total. — means unavailable. Click to open Harness Monitor.';
+ 'Totals include available readings and may be partial. — means unavailable. Click to open Harness Monitor.';
String get detail =>
'${live.length} running across connected machines. Click to open Harness Monitor.\n'
diff --git a/desktop/lib/widgets/workspace_harness_resources.dart b/desktop/lib/widgets/workspace_harness_resources.dart
index 1eb48b6d0..f95d03d6a 100644
--- a/desktop/lib/widgets/workspace_harness_resources.dart
+++ b/desktop/lib/widgets/workspace_harness_resources.dart
@@ -10,9 +10,11 @@ class WorkspaceHarnessResources extends StatelessWidget {
super.key,
required this.monitor,
this.onPressed,
+ this.trailingPadding,
});
final HarnessMonitor monitor;
final VoidCallback? onPressed;
+ final double? trailingPadding;
@override
Widget build(BuildContext context) => ListenableBuilder(
@@ -20,6 +22,10 @@ class WorkspaceHarnessResources extends StatelessWidget {
builder: (context, _) => LayoutBuilder(
builder: (context, constraints) {
final cell = workspaceBarCellSizeOf(context).width;
+ final padding = EdgeInsets.only(
+ left: cell,
+ right: trailingPadding ?? cell,
+ );
var label = monitor.metricsLabel(
ram: false,
gpu: false,
@@ -31,7 +37,7 @@ class WorkspaceHarnessResources extends StatelessWidget {
monitor.metricsLabel(gpu: false, storage: false),
]) {
if (workspaceBarTextSizeOf(context, candidate, grouped: true).width +
- cell * 2 <=
+ padding.horizontal <=
constraints.maxWidth) {
label = candidate;
break;
@@ -42,7 +48,7 @@ class WorkspaceHarnessResources extends StatelessWidget {
tooltip: monitor.resourceDetail,
onPressed: onPressed,
builder: (context, emphasized) => Padding(
- padding: EdgeInsets.symmetric(horizontal: cell),
+ padding: padding,
child: SizedBox(
height: workspaceBarControlHeight(context),
child: Center(
diff --git a/desktop/macos/Runner/SwarmTitlebar.swift b/desktop/macos/Runner/SwarmTitlebar.swift
index f5956d046..264679a09 100644
--- a/desktop/macos/Runner/SwarmTitlebar.swift
+++ b/desktop/macos/Runner/SwarmTitlebar.swift
@@ -978,6 +978,7 @@ private func workspaceBarTextWidth(_ text: String, font: NSFont) -> CGFloat {
}
private let workspaceBarGroupSeparator = " "
+private let workspaceBarSpacing = try! NSRegularExpression(pattern: " {3}| ")
/// Plain toolbar icons emphasize the glyph without a button well.
private class SwarmPlainIconButton: SwarmIconButton {
@@ -1269,6 +1270,8 @@ private final class SwarmContextButton: SwarmIconButton {
private var text = ""
var textAlignment: NSTextAlignment = .right
var contentPadding: CGFloat = 0
+ var trailingContentPadding: CGFloat?
+ var valueGapCells: CGFloat?
var groupGapCells: CGFloat?
private var detail: String?
private var iconAsset: String?
@@ -1286,20 +1289,25 @@ private final class SwarmContextButton: SwarmIconButton {
fileprivate var actionURL: String?
private var textFont: NSFont { font ?? NSFont.monospacedSystemFont(ofSize: 13, weight: .regular) }
private var cellWidth: CGFloat { ("m" as NSString).size(withAttributes: [.font: textFont]).width }
- private var groupSpacingAdjustment: CGFloat {
- guard let groupGapCells else { return 0 }
- return cellWidth * (groupGapCells - CGFloat(workspaceBarGroupSeparator.count))
+ private func spacingAdjustments(_ value: String) -> [(NSRange, CGFloat)] {
+ guard valueGapCells != nil || groupGapCells != nil else { return [] }
+ return workspaceBarSpacing.matches(in: value, range: NSRange(value.startIndex..., in: value)).map { match in
+ let length = CGFloat(match.range.length)
+ let cells = match.range.length == workspaceBarGroupSeparator.count ? groupGapCells : valueGapCells
+ return (match.range, cellWidth * ((cells ?? length) - length))
+ }
}
private var naturalWidths: [CGFloat] {
segments.enumerated().map { index, segment in
workspaceBarTextWidth(segment.text, font: textFont) + (segment.branchSymbol ? cellWidth * 2 : 0)
- + CGFloat(segment.text.components(separatedBy: workspaceBarGroupSeparator).count - 1) * groupSpacingAdjustment
+ + spacingAdjustments(segment.text).reduce(0) { $0 + $1.1 }
+ (index == 0 ? iconWidth : 0)
}
}
var preferredWidth: CGFloat {
if !fieldButtons.isEmpty { return fieldButtons.reduce(0) { $0 + $1.preferredWidth } }
- return ceil(naturalWidths.reduce(0, +) + contentPadding * 2 + (segmented ? CGFloat(segments.count) * cellWidth * 3 : 0))
+ return ceil(naturalWidths.reduce(0, +) + contentPadding + (trailingContentPadding ?? contentPadding)
+ + (segmented ? CGFloat(segments.count) * cellWidth * 3 : 0))
}
func update(_ context: [String: Any]?, enabled: Bool) {
@@ -1406,15 +1414,8 @@ private final class SwarmContextButton: SwarmIconButton {
? workspaceBarEmphasisFont(textFont) : textFont,
.foregroundColor: color, .paragraphStyle: paragraph,
])
- if groupGapCells != nil {
- let text = value as NSString
- var search = NSRange(location: 0, length: text.length)
- while search.length > 0 {
- let range = text.range(of: workspaceBarGroupSeparator, options: [], range: search)
- if range.location == NSNotFound { break }
- line.addAttribute(.kern, value: groupSpacingAdjustment / CGFloat(range.length), range: range)
- search = NSRange(location: NSMaxRange(range), length: text.length - NSMaxRange(range))
- }
+ for (range, adjustment) in spacingAdjustments(value) where adjustment != 0 {
+ line.addAttribute(.kern, value: adjustment / CGFloat(range.length), range: range)
}
return line
}
@@ -1457,9 +1458,10 @@ private final class SwarmContextButton: SwarmIconButton {
}
}
let inset = min(contentPadding, bounds.width / 2)
+ let trailingInset = min(trailingContentPadding ?? contentPadding, bounds.width - inset)
drawPullRequestIcon(x: inset, color: iconColor)
line.draw(in: NSRect(x: inset + iconWidth, y: (bounds.height - line.size().height) / 2,
- width: max(0, bounds.width - inset * 2 - iconWidth), height: line.size().height))
+ width: max(0, bounds.width - inset - trailingInset - iconWidth), height: line.size().height))
return
}
let natural = naturalWidths
@@ -1794,7 +1796,8 @@ private final class SwarmTabStrip: NSView {
fileprivate let devicesButton = SwarmStoreButton()
private var shareTarget: [String: Any]?
private var barFont = NSFont.monospacedSystemFont(ofSize: 13, weight: .regular)
- private var resourceGroupGapCells: CGFloat = 2.5
+ private var resourceValueGapCells: CGFloat = 0.75
+ private var resourceGroupGapCells: CGFloat = 2
private let navigationFont = NSFont.systemFont(ofSize: 13, weight: .regular)
fileprivate let daemonButton = SwarmSymbolButton()
private var daemonArt = SwarmDaemonArt()
@@ -2081,7 +2084,8 @@ private final class SwarmTabStrip: NSView {
barFont = families.lazy.compactMap { NSFont(name: $0, size: size) }.first
?? NSFont.monospacedSystemFont(ofSize: size, weight: .regular)
terminalForeground = statusColor(style["foreground"], fallback: terminalForeground)
- resourceGroupGapCells = CGFloat(max(2, (style["groupGapCells"] as? NSNumber)?.doubleValue ?? 2.5))
+ resourceValueGapCells = CGFloat(max(0.5, (style["valueGapCells"] as? NSNumber)?.doubleValue ?? 0.75))
+ resourceGroupGapCells = CGFloat(max(2, (style["groupGapCells"] as? NSNumber)?.doubleValue ?? 2))
}
for control in [newButton] {
control.font = navigationFont
@@ -2100,6 +2104,7 @@ private final class SwarmTabStrip: NSView {
subscriptionUsageButton.font = barFont
subscriptionUsageButton.foreground = terminalForeground
subscriptionUsageButton.contentPadding = ("m" as NSString).size(withAttributes: [.font: barFont]).width
+ subscriptionUsageButton.valueGapCells = resourceValueGapCells
subscriptionUsageButton.groupGapCells = resourceGroupGapCells
subscriptionUsageState = state["subscriptionUsage"] as? [String: Any]
subscriptionUsageButton.update(subscriptionUsageState, enabled: actionsEnabled)
@@ -2107,12 +2112,14 @@ private final class SwarmTabStrip: NSView {
harnessMonitorButton.font = barFont
harnessMonitorButton.foreground = terminalForeground
harnessMonitorButton.contentPadding = ("m" as NSString).size(withAttributes: [.font: barFont]).width
+ harnessMonitorButton.valueGapCells = resourceValueGapCells
harnessMonitorButton.update(state["harnessMonitor"] as? [String: Any], enabled: actionsEnabled)
harnessMonitorButton.isHidden = state["harnessMonitor"] == nil
machineResourcesState = state["machineResources"] as? [String: Any]
machineResourcesLabel.font = barFont
machineResourcesLabel.foreground = terminalForeground
machineResourcesLabel.contentPadding = harnessMonitorButton.contentPadding
+ machineResourcesLabel.valueGapCells = resourceValueGapCells
machineResourcesLabel.groupGapCells = resourceGroupGapCells
machineResourcesLabel.update(machineResourcesState, enabled: actionsEnabled)
machineResourcesLabel.isHidden = machineResourcesState == nil
@@ -2358,6 +2365,10 @@ private final class SwarmTabStrip: NSView {
let y = (statusBar.bounds.height - height) / 2
let available = max(0, statusBar.bounds.width - cell * 2)
let daemonWidth = daemonButton.isHidden ? 0 : min(daemonButton.preferredWidth, available * 0.5)
+ let showsUsage = hasSubscriptionUsage && (harnessMonitorButton.isHidden || statusBar.bounds.width >= 1050)
+ // The fixed companion slot already has an optical gutter around its art.
+ subscriptionUsageButton.trailingContentPadding = daemonWidth > 0 ? 0 : nil
+ machineResourcesLabel.trailingContentPadding = daemonWidth > 0 && !showsUsage ? 0 : nil
let shareWidth = shareButton.isHidden ? 0 : min(shareButton.preferredWidth, available * 0.3)
let usageBudget = max(0, available - daemonWidth - shareWidth - cell * 4 - resourceGap * 2)
let monitorWidth = harnessMonitorButton.isHidden ? 0 : min(harnessMonitorButton.preferredWidth, usageBudget * 0.4)
@@ -2372,14 +2383,14 @@ private final class SwarmTabStrip: NSView {
}
let hardwareWidth = machineResourcesLabel.isHidden ? 0 : min(machineResourcesLabel.preferredWidth, hardwareBudget)
harnessMonitorButton.frame = NSRect(x: cell, y: y, width: monitorWidth, height: height)
- let usageWidth = hasSubscriptionUsage && (monitorWidth == 0 || statusBar.bounds.width >= 1050)
+ let usageWidth = showsUsage
? min(subscriptionUsageButton.preferredWidth, usageBudget * (monitorWidth == 0 ? 0.45 : 0.22)) : 0
subscriptionUsageButton.isHidden = usageWidth == 0
machineResourcesLabel.frame = NSRect(x: cell + monitorWidth + (monitorWidth > 0 && hardwareWidth > 0 ? resourceGap : 0),
y: y, width: hardwareWidth, height: height)
subscriptionUsageButton.frame = NSRect(x: machineResourcesLabel.frame.maxX + (usageWidth > 0 && (monitorWidth > 0 || hardwareWidth > 0) ? resourceGap : 0),
y: y, width: usageWidth, height: height)
- let daemonLeft = subscriptionUsageButton.frame.maxX + (usageWidth > 0 ? cell * 2 : 0)
+ let daemonLeft = subscriptionUsageButton.frame.maxX + (daemonWidth > 0 ? resourceGap : (usageWidth > 0 ? cell * 2 : 0))
daemonButton.frame = NSRect(x: daemonLeft, y: y, width: daemonWidth, height: height)
let shareLeft = daemonButton.frame.maxX + (daemonWidth > 0 ? cell : 0)
shareButton.frame = NSRect(x: shareLeft, y: y, width: shareWidth, height: height)
diff --git a/desktop/test/harness_resources_test.dart b/desktop/test/harness_resources_test.dart
index 8a235bc4e..88f540d5b 100644
--- a/desktop/test/harness_resources_test.dart
+++ b/desktop/test/harness_resources_test.dart
@@ -142,7 +142,7 @@ void main() {
expect(monitor.metricsLabel(), 'CPU 130% RAM 11 GB GPU 24% SSD 1 GB');
app.machineStates['m']!.agents.add(
const Agent(id: 'unknown', name: 'Unknown', terminalAvailable: true));
- expect(monitor.metricsLabel(), 'CPU ≥130% RAM ≥11 GB GPU ≥24% SSD ≥1 GB');
+ expect(monitor.metricsLabel(), 'CPU 130% RAM 11 GB GPU 24% SSD 1 GB');
expect(monitor.resourceDetail, contains('Files remain after stopping'));
});