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.

Reuse the existing empty New Harness tab everywhere

dee300f04d162dd
diff --git a/desktop/lib/screens/swarm_screen.dart b/desktop/lib/screens/swarm_screen.dart
index 654a77333..1b5361967 100644
--- a/desktop/lib/screens/swarm_screen.dart
+++ b/desktop/lib/screens/swarm_screen.dart
@@ -283,6 +283,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
final payload = {
'enabled': _routeIsCurrent && !_dialogOpen && !_spokenPaletteOpen,
'activeId': app.activeSwarmId,
+ 'canOpenNewTab': app.canOpenNewTab,
'palette': grid.AppTheme.palette.value.nativeColors,
'canReopen': app.canReopenLastClosed,
'canFind': _canFindTerminal,
@@ -985,7 +986,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
}
void _newTab() {
- if (app.panes.isNotEmpty) app.newSwarm();
+ app.newSwarm();
}
Future<void> _addProject() => _dialog(() async {
@@ -1148,7 +1149,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
final number = int.tryParse(id.substring('swarm.select_'.length));
return number != null && number >= 1 && number <= app.swarms.length;
}
- if (id == 'swarm.new') return app.swarms.length < AppNotifier.maxSwarms;
+ if (id == 'swarm.new') return app.canOpenNewTab;
if (id == 'swarm.reopen') return app.canReopenLastClosed;
if (id == 'swarm.next' || id == 'swarm.previous') {
return app.swarms.length > 1;
@@ -1480,7 +1481,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
),
IconButton(
key: const ValueKey('swarm-new-tab-button'),
- onPressed: app.swarms.length < AppNotifier.maxSwarms ? _newTab : null,
+ onPressed: app.canOpenNewTab ? _newTab : null,
icon: const Icon(Icons.add, size: 18, semanticLabel: 'New Tab'),
),
_harnessButton(create: true),
@@ -1512,7 +1513,9 @@ class _SwarmScreenState extends State<SwarmScreen> {
? grid.AppPalette.swarmTabBar
: grid.AppPalette.swarmAccent,
shape: const StadiumBorder(),
- side: create ? BorderSide.none : const BorderSide(color: Colors.white24),
+ side: create
+ ? BorderSide.none
+ : const BorderSide(color: Colors.white24),
),
child: Text(label),
);
diff --git a/desktop/lib/state/app_state.dart b/desktop/lib/state/app_state.dart
index ed5ba299b..ca09f7418 100644
--- a/desktop/lib/state/app_state.dart
+++ b/desktop/lib/state/app_state.dart
@@ -466,6 +466,8 @@ class AppNotifier extends ChangeNotifier {
List<TerminalPane> get panes => activeSwarm.panes;
Iterable<TerminalPane> get allPanes => swarms.expand((s) => s.panes).toSet();
String get activeSwarmId => activeSwarm.id;
+ bool get canOpenNewTab =>
+ swarms.length < maxSwarms || swarms.any((swarm) => swarm.isEmptyStarter);
// A New Harness remains temporary until it has content or a custom name.
// The return destination is session-local; abandoned drafts are never saved.
@@ -481,6 +483,17 @@ class AppNotifier extends ChangeNotifier {
}
void newSwarm({String name = 'New Harness', bool draft = false}) {
+ // Every New Tab entry point reuses the existing start page, including
+ // when another tab is selected or the tab limit has been reached.
+ if (name == 'New Harness') {
+ final starter = activeSwarm.isEmptyStarter
+ ? activeSwarm
+ : swarms.where((swarm) => swarm.isEmptyStarter).firstOrNull;
+ if (starter != null) {
+ if (starter.id != activeSwarmId) selectSwarm(starter.id);
+ return;
+ }
+ }
if (swarms.length >= maxSwarms) return;
while (swarms.any((s) => s.id == 'swarm-$_nextSwarmId')) {
_nextSwarmId++;
@@ -5032,6 +5045,20 @@ class AppNotifier extends ChangeNotifier {
restored.add(swarm);
}
if (restored.isNotEmpty) {
+ // Older builds saved multiple unused start pages. Retain the selected
+ // one when possible; custom names, presets and real work stay intact.
+ final starters = restored.where((swarm) => swarm.isEmptyStarter);
+ final starter =
+ starters
+ .where((swarm) => swarm.id == saved['activeId'])
+ .firstOrNull ??
+ starters.firstOrNull;
+ final hadDuplicateStarters = starters.length > 1;
+ if (hadDuplicateStarters) {
+ restored.removeWhere(
+ (swarm) => swarm.isEmptyStarter && swarm != starter,
+ );
+ }
swarms
..clear()
..addAll(restored);
@@ -5042,6 +5069,7 @@ class AppNotifier extends ChangeNotifier {
_nextSwarmId++;
}
_autoPickedAgent = true;
+ if (hadDuplicateStarters) _persistLayout();
notifyListeners();
return;
}
diff --git a/desktop/lib/state/swarm.dart b/desktop/lib/state/swarm.dart
index fd14daf7e..13d536162 100644
--- a/desktop/lib/state/swarm.dart
+++ b/desktop/lib/state/swarm.dart
@@ -27,6 +27,9 @@ class Swarm {
int? gridColumns;
final Map<int, int> pinnedSlots = {};
+ bool get isEmptyStarter =>
+ name == 'New Harness' && panes.isEmpty && presets.isEmpty;
+
PaneArrangement? get manualLayout => paneSizes['${panes.length}:manual'];
void savePaneSizes(String key, PaneArrangement arrangement) {
diff --git a/desktop/macos/Runner/SwarmTitlebar.swift b/desktop/macos/Runner/SwarmTitlebar.swift
index 9ddaae17a..65cd87fe6 100644
--- a/desktop/macos/Runner/SwarmTitlebar.swift
+++ b/desktop/macos/Runner/SwarmTitlebar.swift
@@ -53,7 +53,8 @@ final class SwarmTitlebar: NSObject, NSMenuItemValidation, NSMenuDelegate {
self.canClosePane = state["canClosePane"] as? Bool == true
self.canGoBack = state["canGoBack"] as? Bool == true
self.canGoForward = state["canGoForward"] as? Bool == true
- self.canCreateSwarm = (state["tabs"] as? [Any] ?? []).count < 24
+ 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)
@@ -898,7 +899,7 @@ private final class SwarmTabStrip: NSView {
updateDividers()
// Moving frames alone leaves AppKit's child traversal in insertion order.
document.setAccessibilityChildren(tabs)
- newButton.isEnabled = actionsEnabled && tabs.count < 24
+ newButton.isEnabled = actionsEnabled && (state["canOpenNewTab"] as? Bool ?? (tabs.count < 24))
notificationButton.isEnabled = actionsEnabled
createButton.isEnabled = actionsEnabled
openButton.isEnabled = actionsEnabled
diff --git a/desktop/test/swarm_async_test.dart b/desktop/test/swarm_async_test.dart
index f20b74c21..e371f8fc0 100644
--- a/desktop/test/swarm_async_test.dart
+++ b/desktop/test/swarm_async_test.dart
@@ -223,7 +223,7 @@ void main() {
final destination = app.activeSwarm;
final launch = app.createAgent('m', engine: 'claude', folder: '/work');
expect(connection.calls, ['agent_create']);
- app.newSwarm();
+ app.newSwarm(name: 'Elsewhere');
if (change == 'close') await app.closeSwarm(destination.id);
if (change == 'dispose') app.dispose();
connection.complete();
diff --git a/desktop/test/swarm_attention_test.dart b/desktop/test/swarm_attention_test.dart
index d883ebbf5..bc2b531b6 100644
--- a/desktop/test/swarm_attention_test.dart
+++ b/desktop/test/swarm_attention_test.dart
@@ -221,7 +221,7 @@ void main() {
await announceQuestion(app, 'a0');
final unopened = swarmAttentionEntries(app).single;
expect(unopened.destination.hasView, isFalse);
- app.newSwarm();
+ app.newSwarm(name: 'Elsewhere');
final second = app.activeSwarm;
expect(
await activateSwarmAttention(app, unopened, destinationSwarmId: first.id),
diff --git a/desktop/test/swarm_closed_agents_test.dart b/desktop/test/swarm_closed_agents_test.dart
index a249c935f..0ac44bfe3 100644
--- a/desktop/test/swarm_closed_agents_test.dart
+++ b/desktop/test/swarm_closed_agents_test.dart
@@ -195,7 +195,7 @@ void main() {
await app.addAgentToSwarm('m', 'a1');
final existing = restored.panes.toList();
while (app.swarms.length < AppNotifier.maxSwarms) {
- app.newSwarm();
+ app.newSwarm(name: 'Occupied ${app.swarms.length}');
}
expect(app.canReopenClosedSwarm, isTrue);
expect(app.canReopenClosed(swarmClosure), isTrue);
@@ -264,7 +264,7 @@ void main() {
app.newSwarm(name: 'Closed group');
await app.closeSwarm(app.activeSwarmId);
while (app.swarms.length < AppNotifier.maxSwarms) {
- app.newSwarm();
+ app.newSwarm(name: 'Occupied ${app.swarms.length}');
}
expect(app.canReopenLastClosed, isFalse);
expect(app.canReopenClosed(agentId), isTrue);
diff --git a/desktop/test/swarm_entry_picker_test.dart b/desktop/test/swarm_entry_picker_test.dart
index 1f7951b85..aa35e1f5d 100644
--- a/desktop/test/swarm_entry_picker_test.dart
+++ b/desktop/test/swarm_entry_picker_test.dart
@@ -313,6 +313,7 @@ void main() {
final app = createApp();
addTearDown(app.dispose);
final original = app.activeSwarmId;
+ app.renameSwarm(original, 'Original work');
app.newSwarm(draft: true);
app.selectSwarm(original);
expect(app.swarms, hasLength(1));
diff --git a/desktop/test/swarm_interactions_test.dart b/desktop/test/swarm_interactions_test.dart
index cabad798f..8a4f617fa 100644
--- a/desktop/test/swarm_interactions_test.dart
+++ b/desktop/test/swarm_interactions_test.dart
@@ -22,7 +22,7 @@ import 'package:harness/widgets/swarm_dialogs.dart';
import 'package:harness/widgets/terminal_find_bar.dart';
import 'swarm_screen_test.dart' show mount, terminal;
-import 'swarm_state_test.dart' show createApp;
+import 'swarm_state_test.dart' show createApp, MemoryStore;
class _ProfilesNotifier extends AppNotifier {
_ProfilesNotifier()
@@ -65,6 +65,83 @@ Future<void> chord(
}
void main() {
+ for (final native in [false, true]) {
+ testWidgets('New Tab actions reuse the existing page (native: $native)', (
+ tester,
+ ) async {
+ const channel = MethodChannel('harness/swarm_tabs');
+ const codec = StandardMethodCodec();
+ final messenger = tester.binding.defaultBinaryMessenger;
+ messenger.setMockMethodCallHandler(channel, (_) async => true);
+ addTearDown(() => messenger.setMockMethodCallHandler(channel, null));
+ final app = createApp();
+ app.machineStates['m']!.nodeOnline = true;
+ app.adoptSessionForTest(terminal('a0', []));
+ final work = app.activeSwarmId;
+ app.newSwarm();
+ final starter = app.activeSwarmId;
+ final projects = SwarmProjectStore(storage: MemoryStore());
+ await tester.pumpWidget(
+ MaterialApp(
+ home: SwarmScreen(
+ notifier: app,
+ nativeTabs: native,
+ projectStore: projects,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ Future<void> newFromChrome() async {
+ if (!native) {
+ await tester.tap(find.byKey(const ValueKey('swarm-new-tab-button')));
+ return;
+ }
+ var replied = false;
+ messenger.handlePlatformMessage(
+ channel.name,
+ codec.encodeMethodCall(const MethodCall('new')),
+ (_) => replied = true,
+ );
+ for (var i = 0; i < 5 && !replied; i++) {
+ await tester.pump();
+ }
+ expect(replied, isTrue);
+ }
+
+ for (final action in <Future<void> Function()>[
+ () => chord(tester, LogicalKeyboardKey.keyT),
+ newFromChrome,
+ () async {
+ await chord(tester, LogicalKeyboardKey.keyP, shift: true);
+ await tester.enterText(
+ find.byKey(const ValueKey('swarm-search-input')),
+ 'New Tab',
+ );
+ await tester.pump();
+ await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+ },
+ ]) {
+ app.selectSwarm(work);
+ await tester.pumpAndSettle();
+ await action();
+ await tester.pumpAndSettle();
+ expect(app.activeSwarmId, starter);
+ expect(app.swarms, hasLength(2));
+ await chord(tester, LogicalKeyboardKey.keyT);
+ expect(app.activeSwarmId, starter);
+ expect(app.swarms, hasLength(2));
+ final input = tester.widget<TextField>(
+ find.byKey(const ValueKey('harness-start-search')),
+ );
+ expect(input.focusNode!.hasFocus, isFalse);
+ }
+ await tester.pumpWidget(const SizedBox());
+ app.dispose();
+ projects.dispose();
+ });
+ }
+
testWidgets(
'welcome opens the shared search and supports readline selection',
(tester) async {
@@ -282,7 +359,10 @@ void main() {
expect(app.swarms, hasLength(1));
expect(app.panes, isEmpty);
expect(app.activeSwarmId, isNot(anyOf(first, second)));
- expect(find.byKey(const ValueKey('harness-start-search')), findsOneWidget);
+ expect(
+ find.byKey(const ValueKey('harness-start-search')),
+ findsOneWidget,
+ );
final starter = app.activeSwarmId;
await activate('new');
expect(app.swarms, hasLength(1));
diff --git a/desktop/test/swarm_navigation_test.dart b/desktop/test/swarm_navigation_test.dart
index f3253bab6..f74bd7acd 100644
--- a/desktop/test/swarm_navigation_test.dart
+++ b/desktop/test/swarm_navigation_test.dart
@@ -247,7 +247,7 @@ void main() {
addTearDown(app.dispose);
final target = app.activeSwarm;
final row = swarmDestinations(app).firstWhere((r) => r.agentId == 'a0');
- app.newSwarm();
+ app.newSwarm(name: 'Elsewhere');
final elsewhere = app.activeSwarm;
await activateSwarmDestination(app, row, destinationSwarmId: target.id);
expect(target.panes.single.agentId, 'a0');
diff --git a/desktop/test/swarm_reopen_test.dart b/desktop/test/swarm_reopen_test.dart
index 7b59b2e4d..6bc789c39 100644
--- a/desktop/test/swarm_reopen_test.dart
+++ b/desktop/test/swarm_reopen_test.dart
@@ -168,12 +168,12 @@ void main() {
await app.closeSwarm(app.activeSwarmId);
}
for (var i = 0; i < AppNotifier.maxSwarms - 1; i++) {
- app.newSwarm();
+ app.newSwarm(name: 'Occupied $i');
}
expect(app.canReopenClosedSwarm, isFalse);
app.reopenClosedSwarm();
expect(app.swarms, hasLength(AppNotifier.maxSwarms));
- await app.closeSwarm(app.activeSwarmId);
+ await app.closeSwarm(app.swarms.first.id);
app.reopenClosedSwarm();
expect(app.activeSwarm.name, 'Closed 26');
// Free slots directly without adding newer close records to this check.
diff --git a/desktop/test/swarm_screen_test.dart b/desktop/test/swarm_screen_test.dart
index 872e4d6fb..45322d550 100644
--- a/desktop/test/swarm_screen_test.dart
+++ b/desktop/test/swarm_screen_test.dart
@@ -404,7 +404,7 @@ void main() {
final replacement = terminal('a0', [])
..terminal.write('replacement stream');
pane.session = replacement;
- app.newSwarm();
+ app.notifyListeners();
await tester.pump();
final parked = tester.widget<TerminalPanel>(
find.byType(TerminalPanel, skipOffstage: false),
diff --git a/desktop/test/swarm_state_test.dart b/desktop/test/swarm_state_test.dart
index 208bba51c..d1f0a9c42 100644
--- a/desktop/test/swarm_state_test.dart
+++ b/desktop/test/swarm_state_test.dart
@@ -7,6 +7,8 @@ import 'package:harness/state/app_state.dart';
import 'package:harness/state/pane_layout_store.dart';
import 'package:harness/state/pane_preset.dart';
import 'package:harness/state/swarm_catalog.dart';
+import 'package:harness/state/swarm.dart';
+import 'package:harness/state/terminal_pane.dart';
import 'package:harness/terminal/terminal_session.dart';
import 'package:harness/ws/ws_conn.dart';
@@ -58,6 +60,76 @@ AppNotifier createApp({
}
void main() {
+ test(
+ 'New Tab reuses the unused page from every tab, even at capacity',
+ () async {
+ final app = createApp();
+ addTearDown(app.dispose);
+ final starter = app.activeSwarm;
+ for (var i = 0; i < 10; i++) {
+ app.newSwarm();
+ }
+ expect(app.swarms, [starter]);
+
+ for (var i = 1; i < AppNotifier.maxSwarms; i++) {
+ app.newSwarm(name: 'Project $i');
+ }
+ final project = app.activeSwarm;
+ expect(app.canOpenNewTab, isTrue);
+ for (var i = 0; i < 10; i++) {
+ app.selectSwarm(project.id);
+ app.newSwarm();
+ expect(app.activeSwarm, same(starter));
+ expect(app.swarms, hasLength(AppNotifier.maxSwarms));
+ }
+
+ await app.addAgentToSwarm('m', 'a0');
+ expect(app.canOpenNewTab, isFalse);
+ app.newSwarm();
+ expect(app.activeSwarm, same(starter));
+ expect(app.panes.single.agentId, 'a0');
+ expect(app.swarms, hasLength(AppNotifier.maxSwarms));
+ },
+ );
+
+ for (final activeId in ['empty-2', 'work']) {
+ test(
+ 'restore consolidates unused tabs while retaining $activeId',
+ () async {
+ final storage = MemoryStore();
+ final store = PaneLayoutStore(storage: storage);
+ await store.saveSwarms([
+ Swarm(id: 'empty-1'),
+ Swarm(id: 'work', name: 'Work')
+ ..panes.add(TerminalPane(id: 1, machineId: 'm', agentId: 'a0')),
+ Swarm(id: 'empty-2'),
+ Swarm(id: 'named', name: 'Plan'),
+ Swarm(id: 'layout')..presets[2] = PanePreset.rows,
+ Swarm(id: 'empty-3', name: 'New tab'),
+ ], activeId);
+ final app = createApp(store: storage);
+ addTearDown(app.dispose);
+ await app.restorePaneLayoutForTest();
+ expect(app.activeSwarmId, activeId);
+ expect(app.swarms.where((swarm) => swarm.isEmptyStarter), hasLength(1));
+ expect(app.swarms.map((swarm) => swarm.id), [
+ if (activeId == 'work') 'empty-1',
+ 'work',
+ if (activeId == 'empty-2') 'empty-2',
+ 'named',
+ 'layout',
+ ]);
+ expect(app.allPanes.single.agentId, 'a0');
+ expect(app.allPanes.single.session, isNull);
+ expect(app.closedHistory, isEmpty);
+ await app.flushPaneLayout();
+ final saved = await store.loadSwarms();
+ expect((saved!['swarms'] as List), hasLength(4));
+ expect(saved['activeId'], activeId);
+ },
+ );
+ }
+
for (final legacy in ['New swarm', 'New tab', 'New Agent']) {
test(
'$legacy empty tabs restore as New Harness and still name the first agent',
@@ -244,13 +316,13 @@ void main() {
'new tab ids cannot collide after reorder and gaps in saved ids',
() async {
final app = createApp();
- app.newSwarm();
- app.newSwarm();
- app.newSwarm();
+ app.newSwarm(name: 'Second');
+ app.newSwarm(name: 'Third');
+ app.newSwarm(name: 'Fourth');
await app.closeSwarm('swarm-2');
app.reorderSwarm('swarm-4', 0);
- app.newSwarm();
- app.newSwarm();
+ app.newSwarm(name: 'Fifth');
+ app.newSwarm(name: 'Sixth');
expect(app.swarms.map((s) => s.id).toSet().length, app.swarms.length);
while (app.swarms.length > 1) {
await app.closeSwarm(app.swarms.first.id);
diff --git a/desktop/tool/swarm_titlebar_checks.swift b/desktop/tool/swarm_titlebar_checks.swift
index 962bdf61a..d76438459 100644
--- a/desktop/tool/swarm_titlebar_checks.swift
+++ b/desktop/tool/swarm_titlebar_checks.swift
@@ -166,6 +166,16 @@ private extension SwarmTabStrip {
try checkTitlebar(tabs.count == 1 && tabs[0] === original, "Closing tabs retains the surviving control")
try original.checkAccessibility(expectedName: "Renamed tab", active: true)
try checkTitlebar(newButton.isEnabled, "New Harness returns below capacity")
+ var fullWithStarter = state(rows, active: "swarm-0")
+ fullWithStarter["canOpenNewTab"] = true
+ update(fullWithStarter)
+ try checkTitlebar(newButton.isEnabled,
+ "New Tab can reveal an existing starter at the tab limit")
+ fullWithStarter["canOpenNewTab"] = false
+ update(fullWithStarter)
+ try checkTitlebar(!newButton.isEnabled,
+ "New Tab respects the workspace's availability")
+ update(state([["id": "swarm-0", "name": "Renamed tab"]], active: "swarm-0"))
try checkTitlebar(newButton.toolTip == nil && createButton.toolTip == nil && openButton.toolTip == nil,
"Titlebar actions add no hover hints")
try checkTitlebar(notificationButton.frame.maxX <= scroll.frame.minX,
diff --git a/docs/harness-agent-first-tabs.md b/docs/harness-agent-first-tabs.md
index 3d99b8df7..f51be9aa5 100644
--- a/docs/harness-agent-first-tabs.md
+++ b/docs/harness-agent-first-tabs.md
@@ -81,6 +81,10 @@ handing keyboard ownership back to Flutter and preserve in-progress search compo
One harness shows its engine mark; multiple harnesses use four separate outlined
tiles, matching the native square.grid.2x2 symbol. An empty tab uses a plain plus.
+Only one unused New Harness tab is kept. New Tab from the plus, File menu,
+Cmd-T or command search selects that existing page, even at the tab limit.
+Restoration collapses duplicate unused pages from older builds, preferring the
+selected one; named tabs and saved layouts are retained.
Tab close marks appear only on hover or keyboard focus, retaining their space
and accessible actions while idle. Returning
to one restores the engine mark. The same rule applies in search and History,