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.

Keep native agent inventory out of tab navigation updates

deebef8cd66838e
diff --git a/desktop/lib/screens/swarm_screen.dart b/desktop/lib/screens/swarm_screen.dart
index 2b3ceddc2..1f114c638 100644
--- a/desktop/lib/screens/swarm_screen.dart
+++ b/desktop/lib/screens/swarm_screen.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
import 'dart:io' show Platform;
import 'package:file_selector/file_selector.dart';
+import 'package:flutter/foundation.dart' show listEquals;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -91,6 +92,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
bool _routeIsCurrent = true;
String? _linkDialogMachineId;
String? _nativeState;
+ List<Object?>? _machinesPresentation;
ModelsMenuController? _modelsMenu;
String? _modelsState;
final _defaultKeymap = AppKeymap();
@@ -169,6 +171,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
unawaited(
_channel.invokeMethod<void>('modelsState', {'subscriptions': []}),
);
+ unawaited(_channel.invokeMethod<void>('machinesState', {'machines': []}));
app.removeListener(_syncNative);
_channel.setMethodCallHandler(null);
unawaited(
@@ -284,10 +287,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
}
void _syncNative() {
- final openAgents = {
- for (final tab in app.swarms)
- for (final pane in tab.panes) (pane.machineId, pane.agentId),
- };
+ _syncMachines();
final payload = {
'enabled': _routeIsCurrent && !_dialogOpen && !_spokenPaletteOpen,
'activeId': app.activeSwarmId,
@@ -313,41 +313,6 @@ class _SwarmScreenState extends State<SwarmScreen> {
},
],
'attention': _attention,
- 'machines': [
- for (final machine in app.machineStates.values)
- {
- 'id': machine.machine.machineId,
- 'name': machine.machine.displayName,
- 'local': machine.isLocalMachine,
- 'agentCount':
- machine.agents.isNotEmpty ||
- machine.agentLoadStatus == AgentLoadStatus.loaded
- ? machine.agents.length
- : null,
- 'agents': [
- for (final agent in machine.agents.take(512))
- {
- 'id': agent.id,
- 'title': agent.name,
- 'engine': agent.engine,
- 'iconAsset': engineIdentity(agent.engine).asset,
- 'canOpen':
- agent.terminalAvailable ||
- openAgents.contains((
- machine.machine.machineId,
- agent.id,
- )),
- },
- ],
- 'status': machine.needsLink
- ? 'Link required'
- : machine.nodeOnline == false
- ? 'Offline'
- : machine.nodeOnline == true
- ? 'Online'
- : 'Connecting…',
- },
- ],
'history': [
for (final entry in _navigation.menuDestinations(app))
{
@@ -386,6 +351,81 @@ class _SwarmScreenState extends State<SwarmScreen> {
unawaited(_channel.invokeMethod<void>('update', payload));
}
+ void _syncMachines() {
+ final openAgents = {
+ for (final tab in app.swarms)
+ for (final pane in tab.panes) (pane.machineId, pane.agentId),
+ };
+ final machines = app.machineStates.values.take(128);
+ // Compare only visible values before building/encoding a potentially large
+ // inventory. Tab focus, palette and attention changes use the small update
+ // message; they never resend or decode every agent on the native thread.
+ final presentation = <Object?>[
+ for (final machine in machines) ...[
+ (
+ machine.machine.machineId,
+ machine.machine.displayName,
+ machine.isLocalMachine,
+ machine.nodeOnline,
+ machine.needsLink,
+ machine.agents.isNotEmpty ||
+ machine.agentLoadStatus == AgentLoadStatus.loaded
+ ? machine.agents.length
+ : null,
+ ),
+ for (final agent in machine.agents.take(512))
+ (
+ agent.id,
+ agent.name,
+ agent.engine,
+ agent.terminalAvailable ||
+ openAgents.contains((machine.machine.machineId, agent.id)),
+ ),
+ ],
+ ];
+ if (listEquals(presentation, _machinesPresentation)) return;
+ _machinesPresentation = presentation;
+ unawaited(
+ _channel.invokeMethod<void>('machinesState', {
+ 'machines': [
+ for (final machine in machines)
+ {
+ 'id': machine.machine.machineId,
+ 'name': machine.machine.displayName,
+ 'local': machine.isLocalMachine,
+ 'agentCount':
+ machine.agents.isNotEmpty ||
+ machine.agentLoadStatus == AgentLoadStatus.loaded
+ ? machine.agents.length
+ : null,
+ 'agents': [
+ for (final agent in machine.agents.take(512))
+ {
+ 'id': agent.id,
+ 'title': agent.name,
+ 'engine': agent.engine,
+ 'iconAsset': engineIdentity(agent.engine).asset,
+ 'canOpen':
+ agent.terminalAvailable ||
+ openAgents.contains((
+ machine.machine.machineId,
+ agent.id,
+ )),
+ },
+ ],
+ 'status': machine.needsLink
+ ? 'Link required'
+ : machine.nodeOnline == false
+ ? 'Offline'
+ : machine.nodeOnline == true
+ ? 'Online'
+ : 'Connecting…',
+ },
+ ],
+ }),
+ );
+ }
+
void _syncModels() {
final payload = {'subscriptions': _modelsMenu?.rows ?? []};
final encoded = jsonEncode(payload);
diff --git a/desktop/macos/Runner/SwarmTitlebar.swift b/desktop/macos/Runner/SwarmTitlebar.swift
index bc8089cd2..3cac3acf3 100644
--- a/desktop/macos/Runner/SwarmTitlebar.swift
+++ b/desktop/macos/Runner/SwarmTitlebar.swift
@@ -56,10 +56,13 @@ final class SwarmTitlebar: NSObject, NSMenuItemValidation, NSMenuDelegate {
self.canCreateSwarm = state["canOpenNewTab"] as? Bool
?? ((state["tabs"] as? [Any] ?? []).count < 24)
self.updateHistory(state["history"] as? [[String: Any]] ?? [], closed: state["closedHistory"] as? [[String: Any]] ?? [])
- self.updateMachines(state["machines"] as? [[String: Any]] ?? [])
self.strip.update(state)
self.window?.backgroundColor = self.strip.palette.tabBar
result(nil)
+ case "machinesState":
+ let state = call.arguments as? [String: Any] ?? [:]
+ self.updateMachines(state["machines"] as? [[String: Any]] ?? [])
+ result(nil)
case "modelsState":
let state = call.arguments as? [String: Any] ?? [:]
self.updateModels(state["subscriptions"] as? [[String: Any]] ?? [])
diff --git a/desktop/test/machines_manager_test.dart b/desktop/test/machines_manager_test.dart
index 91dfe24ee..3239bb598 100644
--- a/desktop/test/machines_manager_test.dart
+++ b/desktop/test/machines_manager_test.dart
@@ -37,7 +37,9 @@ void main() {
tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
channel,
(call) async {
- if (call.method == 'update') updates.add(call.arguments as Map);
+ if (call.method == 'machinesState') {
+ updates.add(call.arguments as Map);
+ }
return null;
},
);
diff --git a/desktop/test/machines_menu_test.dart b/desktop/test/machines_menu_test.dart
index 0b52f4dc9..5c00c8316 100644
--- a/desktop/test/machines_menu_test.dart
+++ b/desktop/test/machines_menu_test.dart
@@ -3,6 +3,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
+import 'package:harness/core/models.dart';
import 'package:harness/screens/swarm_screen.dart';
import 'package:harness/state/swarm_catalog.dart';
import 'package:harness/terminal/terminal_binary.dart';
@@ -11,6 +12,93 @@ import 'swarm_state_test.dart' show createApp;
import 'swarm_screen_test.dart' show terminal;
void main() {
+ testWidgets('tab navigation does not resend the agent inventory', (
+ tester,
+ ) async {
+ const channel = MethodChannel('harness/swarm_tabs');
+ final messages = <MethodCall>[];
+ tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(channel, (
+ call,
+ ) async {
+ messages.add(call);
+ return true;
+ });
+ addTearDown(
+ () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
+ channel,
+ null,
+ ),
+ );
+ final app = createApp();
+ final machine = app.machineStates['m']!;
+ machine.agents = [
+ for (var i = 0; i < 512; i++)
+ Agent(id: 'a$i', name: 'Agent $i', terminalAvailable: true),
+ ];
+ final first = app.activeSwarmId;
+ app.adoptSessionForTest(terminal('a0', []));
+ app.newSwarm(name: 'Second');
+ final second = app.activeSwarmId;
+ final projects = SwarmProjectStore();
+ await tester.pumpWidget(
+ MaterialApp(
+ home: SwarmScreen(
+ notifier: app,
+ nativeTabs: true,
+ projectStore: projects,
+ ),
+ ),
+ );
+ await tester.pump();
+ List<List> inventories() => [
+ for (final call in messages)
+ if (call.arguments case {'machines': final List machines}) machines,
+ ];
+ expect((inventories().last.single as Map)['agents'], hasLength(512));
+ messages.clear();
+ for (var i = 0; i < 3; i++) {
+ app.selectSwarm(first);
+ await tester.pump();
+ app.selectSwarm(second);
+ await tester.pump();
+ }
+ expect(messages.where((call) => call.method == 'update'), isNotEmpty);
+ expect(inventories(), isEmpty);
+
+ // Changing one visible name still refreshes the menu, including when the
+ // inventory list itself is retained by discovery.
+ messages.clear();
+ machine.agents[1] = machine.agents[1].copyWith(name: 'Renamed agent');
+ app.notifyListeners();
+ await tester.pump();
+ expect(inventories(), hasLength(1));
+ final refreshed = inventories().single.single as Map;
+ expect((refreshed['agents'] as List)[1]['title'], 'Renamed agent');
+ messages.clear();
+ app.notifyListeners();
+ await tester.pump();
+ expect(inventories(), isEmpty);
+
+ machine.agents[1] = const Agent(id: 'a1', name: 'Renamed agent');
+ app.notifyListeners();
+ await tester.pump();
+ Map renamed() =>
+ ((inventories().last.single as Map)['agents'] as List)[1] as Map;
+ expect(renamed()['canOpen'], isFalse);
+ final retained = app.adoptSessionForTest(terminal('a1', []));
+ app.notifyListeners();
+ await tester.pump();
+ expect(renamed()['canOpen'], isTrue);
+ await app.closePane(retained.id);
+ await tester.pump();
+ expect(renamed()['canOpen'], isFalse);
+
+ await tester.pumpWidget(const SizedBox());
+ expect(inventories().last, isEmpty);
+ app.dispose();
+ projects.dispose();
+ });
+
testWidgets(
'machine submenu lists cached agents and opens an exact existing view',
(tester) async {
@@ -39,7 +127,8 @@ void main() {
);
await tester.pump();
final snapshot =
- messages.lastWhere((c) => c.method == 'update').arguments as Map;
+ messages.lastWhere((c) => c.method == 'machinesState').arguments
+ as Map;
final machine = (snapshot['machines'] as List).single as Map;
expect(machine['agentCount'], 70);
final rows = machine['agents'] as List;
diff --git a/desktop/tool/swarm_titlebar_checks.swift b/desktop/tool/swarm_titlebar_checks.swift
index 6ccc6a72b..1da0cc789 100644
--- a/desktop/tool/swarm_titlebar_checks.swift
+++ b/desktop/tool/swarm_titlebar_checks.swift
@@ -607,7 +607,7 @@ private extension SwarmTitlebar {
["id": "two", "title": "Unavailable session", "canOpen": false]]],
["id": "home", "name": "iMac – Home", "status": "Offline", "local": false, "agentCount": 0],
]
- updateMachines(machineRows)
+ _ = try messenger.receive("machinesState", arguments: ["machines": machineRows])
let machineMenu = main.item(withTitle: "Machines")!.submenu!
let manager = machineMenu.items.first!
try checkTitlebar(manager.title == "Open Machines Manager" && manager.representedObject as? String == "manageMachines" && machineMenu.items[1].isSeparatorItem,
@@ -626,6 +626,13 @@ private extension SwarmTitlebar {
let agentItems = destinations[0].submenu!.items.filter { $0.action == #selector(machineAgentAction(_:)) }
try checkTitlebar(agentItems.map(\.title) == ["App work", "Unavailable session"] && agentItems[0].image != nil,
"Machines expand into named agents with engine icons")
+ _ = try messenger.receive("update", arguments: [
+ "tabs": [["id": "navigation-check", "name": "Another tab"]],
+ "activeId": "navigation-check", "enabled": true,
+ ])
+ try checkTitlebar(machineMenu.items.contains(where: { $0 === destinations[0] }) &&
+ destinations[0].submenu?.items.contains(where: { $0 === agentItems[0] }) == true,
+ "Tab updates retain the existing machine menu and agent controls")
try checkTitlebar(validateMenuItem(agentItems[0]) && !validateMenuItem(agentItems[1]),
"Unavailable agents cannot be activated")
machineAgentAction(agentItems[0])
@@ -652,7 +659,7 @@ private extension SwarmTitlebar {
updateMachines(machineRows)
try checkTitlebar(machineMenu.items.contains(where: { $0 === destinations[0] }),
"Unchanged machine data retains menu controls")
- updateMachines([])
+ _ = try messenger.receive("machinesState", arguments: ["machines": []])
try checkTitlebar(!validateMenuItem(destinations[0]) && !validateMenuItem(agentItems[0]) &&
machineMenu.item(withTitle: "No Machines Linked")?.isEnabled == false,
"Unlinking computers clears destinations and invalidates stale actions")