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 direct choices out of More menus

dee49db3a767a91
diff --git a/desktop/lib/shared/widgets/app_choice_picker.dart b/desktop/lib/shared/widgets/app_choice_picker.dart
index 809ad4e01..8abc89621 100644
--- a/desktop/lib/shared/widgets/app_choice_picker.dart
+++ b/desktop/lib/shared/widgets/app_choice_picker.dart
@@ -260,7 +260,7 @@ class _AppChoicePickerState<T> extends State<AppChoicePicker<T>> {
child: AppSelectField<T>(
key: widget.moreKey,
value: widget.value,
- options: ordered,
+ options: ordered.skip(3).toList(),
onChanged: _choose,
width: size.width,
height: size.height,
diff --git a/desktop/test/app_choice_picker_test.dart b/desktop/test/app_choice_picker_test.dart
index 560faa43a..ded15598e 100644
--- a/desktop/test/app_choice_picker_test.dart
+++ b/desktop/test/app_choice_picker_test.dart
@@ -5,7 +5,7 @@ import 'package:harness/shared/widgets/app_choice_picker.dart';
import 'package:harness/shared/widgets/app_select_field.dart';
void main() {
- testWidgets('tiled dropdown focus does not mark a second choice', (
+ testWidgets('tiled overflow omits direct choices and keeps one selection', (
tester,
) async {
var selected = 'codex';
@@ -21,6 +21,7 @@ void main() {
SelectOption(value: 'claude', label: 'Claude Code'),
SelectOption(value: 'opencode', label: 'OpenCode'),
SelectOption(value: 'amp', label: 'Amp'),
+ SelectOption(value: 'pi', label: 'Pi'),
],
optionKey: (id) => ValueKey(id),
moreKey: moreKey,
@@ -40,6 +41,19 @@ void main() {
await tester.pumpAndSettle();
}
+ await tester.tap(find.byKey(moreKey));
+ await tester.pumpAndSettle();
+ for (final name in ['Codex', 'Claude Code', 'OpenCode']) {
+ expect(
+ find.text(name),
+ findsOneWidget,
+ ); // Only the tile, never a menu row.
+ }
+ expect(find.text('Amp'), findsOneWidget);
+ expect(find.text('Pi'), findsOneWidget);
+ await tester.sendKeyEvent(LogicalKeyboardKey.escape);
+ await tester.pumpAndSettle();
+
await chooseFromMenu(LogicalKeyboardKey.keyA, 'a');
expect(selected, 'amp');
expect(
@@ -53,8 +67,13 @@ void main() {
isEmpty,
);
- // Picking a primary choice from the menu returns focus to the fourth tile.
- await chooseFromMenu(LogicalKeyboardKey.keyC, 'c');
+ await tester.tap(find.byKey(const ValueKey('codex')));
+ await tester.pumpAndSettle();
+ // Browsing alternatives and cancelling returns focus to the fourth tile.
+ await tester.tap(find.byKey(moreKey));
+ await tester.pumpAndSettle();
+ await tester.sendKeyEvent(LogicalKeyboardKey.escape);
+ await tester.pumpAndSettle();
expect(selected, 'codex');
expect(find.text('Amp'), findsOneWidget);
final more = find.byKey(moreKey);
diff --git a/desktop/test/new_agent_codex_profile_test.dart b/desktop/test/new_agent_codex_profile_test.dart
index f38c043ae..31454fb99 100644
--- a/desktop/test/new_agent_codex_profile_test.dart
+++ b/desktop/test/new_agent_codex_profile_test.dart
@@ -190,10 +190,10 @@ void main() {
await tester.tap(find.text('open'));
await tester.pumpAndSettle();
if (!revealOptions) return n;
- await tester.ensureVisible(find.byKey(const Key('new-agent-engine-field')));
- await tester.tap(find.byKey(const Key('new-agent-engine-field')));
+ final codex = find.byKey(const ValueKey('new-agent-quick-codex'));
+ await tester.ensureVisible(codex);
await tester.pumpAndSettle();
- await tester.tap(find.text('Codex').last);
+ await tester.tap(codex);
await tester.pumpAndSettle();
// The profile lives behind the fold now: it and the bypass flag are the two
// settings most people never touch, so they are off the path of somebody who
@@ -507,12 +507,10 @@ void main() {
testWidgets('changing engines clears the selected account', (tester) async {
final notifier = await open(tester);
await selectSecond(tester);
- await tester.ensureVisible(find.byKey(const Key('new-agent-engine-field')));
- await tester.tap(find.byKey(const Key('new-agent-engine-field')));
+ final claude = find.byKey(const ValueKey('new-agent-quick-claude'));
+ await tester.ensureVisible(claude);
await tester.pumpAndSettle();
- await tester.ensureVisible(find.text('Claude Code').last);
- await tester.pumpAndSettle();
- await tester.tap(find.text('Claude Code').last);
+ await tester.tap(claude);
await tester.pumpAndSettle();
expect(
find.byKey(const Key('new-agent-codex-profile-field')),
diff --git a/docs/harness-agent-first-tabs.md b/docs/harness-agent-first-tabs.md
index 2c7fd60c4..6df2cff67 100644
--- a/docs/harness-agent-first-tabs.md
+++ b/docs/harness-agent-first-tabs.md
@@ -21,6 +21,7 @@ waiting for the user to request copy removal one control at a time.
Tooltips must add information, never repeat a visible label.
Each choice row has exactly one selected option. Only selection gets an outline;
keyboard focus uses a quiet fill so it cannot look like a second selection.
+More menus show only the remaining choices, without repeating the visible tiles.
Icon buttons share a quiet rounded background on hover and keyboard focus.
Apply this to native tab close, new-tab and notification icons as well as
Flutter controls. Disabled icons do not highlight; decorative icons stay inert.
diff --git a/docs/harness-v2-handoff.md b/docs/harness-v2-handoff.md
index e8cf5cf0e..3b9f3d848 100644
--- a/docs/harness-v2-handoff.md
+++ b/docs/harness-v2-handoff.md
@@ -49,7 +49,8 @@ Logs: `/private/tmp/harness-friendly-names-tests.log` and
The current form uses three rows of four equal tiles:
- Engine: Codex, Claude Code, OpenCode, More ⌄. A selected alternative replaces
- More, retaining the arrow and the same four tiles.
+ More, retaining the arrow and the same four tiles. Both engine and machine
+ More menus omit the first three choices already visible in their row.
- Machine: this computer and online machines first, with three direct choices
and the same fourth-slot dropdown. Monitor / monitor-off icons carry availability.
- Project: New project, Local, Git, Recent ⌄. Local opens the selected machine’s