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.

Devices leaves Experiments: the tab and its Store listing are on for everyone on desktop

0xdiego2539f4b7842205
diff --git a/desktop/integration_test/devices_native_test.dart b/desktop/integration_test/devices_native_test.dart
index 8770b30cb..4ad07341f 100644
--- a/desktop/integration_test/devices_native_test.dart
+++ b/desktop/integration_test/devices_native_test.dart
@@ -126,11 +126,6 @@ void main() {
await tester.ensureVisible(find.byKey(const Key('devices-add')));
await tester.pumpAndSettle();
await capture('dark-devices-dsh');
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, false);
- await tester.pumpAndSettle();
- await native(tester, 'devices');
- expect(app.swarms.any((tab) => tab.isDevices), isFalse);
- expect(find.byType(DevicesScreen), findsNothing);
expect(tester.takeException(), isNull);
await tester.pumpWidget(const SizedBox());
app.dispose();
diff --git a/desktop/lib/devices/devices_harness_controller.dart b/desktop/lib/devices/devices_harness_controller.dart
index f929ff5b3..0afaca5b8 100644
--- a/desktop/lib/devices/devices_harness_controller.dart
+++ b/desktop/lib/devices/devices_harness_controller.dart
@@ -106,7 +106,7 @@ class DevicesHarnessController extends ChangeNotifier {
if (!_current(owner)) return;
if (failure != null) {
// This package ships with the CLI and is deliberately absent from
- // dsh_list. The Store exposes it through the account's experiment.
+ // dsh_list. The Store lists it as a bundled workspace.
// A missing bundle requires a Harness update,
// not a Store install or a raw INVALID_DSH message in the dashboard.
error = switch (_creation!.refusal) {
diff --git a/desktop/lib/screens/swarm_screen.dart b/desktop/lib/screens/swarm_screen.dart
index d8c877408..57f57b9f4 100644
--- a/desktop/lib/screens/swarm_screen.dart
+++ b/desktop/lib/screens/swarm_screen.dart
@@ -7802,6 +7802,15 @@ class _SwarmScreenState extends State<SwarmScreen> {
WorkspaceStoreButton.widthOf(context),
math.max(0.0, constraints.maxWidth - cell.width * 22),
);
+ // Devices only where Store keeps its full width beside it. A narrow
+ // window drops it from the bar first; Harness Store still opens it.
+ final devicesWidth =
+ WorkspaceStoreButton.widthOf(context, devices: true) +
+ DesktopChrome.controlGap;
+ final showDevices =
+ app.devicesEnabled &&
+ constraints.maxWidth - cell.width * 22 >=
+ WorkspaceStoreButton.widthOf(context) + devicesWidth;
// Store, search and notifications — none of it here when the title bar
// holds them.
final actionsWidth = _titleBarActions
@@ -7809,10 +7818,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
: storeWidth +
cell.width * 8 +
DesktopChrome.controlGap +
- (app.devicesEnabled
- ? WorkspaceStoreButton.widthOf(context, devices: true) +
- DesktopChrome.controlGap
- : 0);
+ (showDevices ? devicesWidth : 0);
final leadingWidth = chrome?.leadingWidth(context) ?? 0.0;
final tabBudget = math.max(
0.0,
@@ -7972,7 +7978,7 @@ class _SwarmScreenState extends State<SwarmScreen> {
_searchButton(theme),
_notificationsButton(theme),
const SizedBox(width: DesktopChrome.controlGap),
- if (app.devicesEnabled) ...[
+ if (showDevices) ...[
_devicesButton(context),
const SizedBox(width: DesktopChrome.controlGap),
],
diff --git a/desktop/lib/settings/experimental_features.dart b/desktop/lib/settings/experimental_features.dart
index 51347d853..47f900509 100644
--- a/desktop/lib/settings/experimental_features.dart
+++ b/desktop/lib/settings/experimental_features.dart
@@ -15,11 +15,6 @@ enum ExperimentalFeature {
'share_button',
'Share button',
'Show Share in the top-right corner of the workspace.',
- ),
- devicesTab(
- 'devices_tab',
- 'Devices tab',
- 'Manage your Harness devices. Show Devices next to Harness Store and in its catalog. Off by default.',
);
const ExperimentalFeature(this.id, this.label, this.description);
@@ -27,7 +22,6 @@ enum ExperimentalFeature {
bool get available => switch (this) {
focusBarCreature => !kIsWeb && !kViewerMode,
shareButton => true,
- devicesTab => !kIsWeb && !kViewerMode,
};
}
@@ -142,10 +136,7 @@ class ExperimentalFeaturesStore extends ChangeNotifier {
revision < 0 ||
features is! Map ||
ExperimentalFeature.values.any(
- (feature) =>
- features[feature.id] is! bool &&
- !(feature == ExperimentalFeature.devicesTab &&
- !features.containsKey(feature.id)),
+ (feature) => features[feature.id] is! bool,
)) {
throw const FormatException('Invalid account settings');
}
diff --git a/desktop/lib/state/app_state.dart b/desktop/lib/state/app_state.dart
index b2c718620..51f92104d 100644
--- a/desktop/lib/state/app_state.dart
+++ b/desktop/lib/state/app_state.dart
@@ -1616,10 +1616,9 @@ class AppNotifier extends ChangeNotifier {
String? _pendingStoreHarness;
- bool get devicesEnabled =>
- ExperimentalFeature.devicesTab.available &&
- experimentalFeatures.isAvailable(ExperimentalFeature.devicesTab) &&
- experimentalFeatures.enabled(ExperimentalFeature.devicesTab);
+ /// Devices is a regular workspace on the desktop app. A browser or a viewer
+ /// build has no device on its desk to manage.
+ bool get devicesEnabled => !kIsWeb && !kViewerMode;
LocalKeyValueStore? get deviceLibraryStorage => _paneLayout?.storage;
final deviceHosts = DeviceHosts();
@@ -1820,8 +1819,7 @@ class AppNotifier extends ChangeNotifier {
}
}
- /// One utility tab for physical devices. The experiment must be explicitly
- /// acknowledged before any entry point, including restored history, opens it.
+ /// One utility tab for physical devices.
void openDevices() {
if (!devicesEnabled) return;
final existing = swarms.where((s) => s.isDevices).firstOrNull;
@@ -1856,43 +1854,6 @@ class AppNotifier extends ChangeNotifier {
selectSwarm(tab.id);
}
- void _devicesExperimentChanged() {
- if (devicesEnabled) return;
- final historyCount = _closedHistory.length;
- _closedHistory.removeWhere(
- (entry) => entry is ClosedSwarm && entry.kind == 'devices',
- );
- if (!swarms.any((s) => s.isDevices)) {
- if (historyCount != _closedHistory.length) notifyListeners();
- return;
- }
- final removed = swarms.where((s) => s.isDevices).toList();
- swarms.removeWhere((s) => s.isDevices);
- for (final tab in removed) {
- for (final pane in tab.panes) {
- if (!allPanes.contains(pane)) {
- unawaited(_detachSession(pane, sendClose: true));
- }
- }
- }
- if (swarms.isEmpty) swarms.add(Swarm(id: 'swarm-${_nextSwarmId++}'));
- if (!experimentalFeatures.loaded) {
- // Binding a different account hides its predecessor's page immediately,
- // before that account's workspace is ready to be persisted or attached.
- if (!swarms.any((s) => s.id == _activeSwarmId)) {
- _activeSwarmId = profileSwarms.first.id;
- }
- notifyListeners();
- return;
- }
- if (!swarms.any((s) => s.id == _activeSwarmId)) {
- selectSwarm(profileSwarms.first.id);
- } else {
- _persistLayout();
- notifyListeners();
- }
- }
-
void _ensureDevicesViewer(Swarm tab) {
if (!devicesEnabled) return;
if (!tab.panes.any((pane) => pane.isDevices)) {
@@ -3173,7 +3134,6 @@ class AppNotifier extends ChangeNotifier {
// `this.` because the constructor's own parameter of the same name is in
// scope here and is the nullable one.
this.agentUnread.addListener(_announceUnreadToDial);
- experimentalFeatures.addListener(_devicesExperimentChanged);
addListener(_syncDeviceHosts);
addListener(_firstArrivalBehindTour);
_autoRenameTabs = appearancePrefsStore.value.autoRenameTabs;
diff --git a/desktop/lib/store/experimental_harnesses.dart b/desktop/lib/store/experimental_harnesses.dart
index 63b58e45a..23e9b842b 100644
--- a/desktop/lib/store/experimental_harnesses.dart
+++ b/desktop/lib/store/experimental_harnesses.dart
@@ -1,11 +1,15 @@
+import 'package:flutter/foundation.dart';
+
import '../core/dsh_catalog.dart';
+import '../core/viewer_mode.dart';
import '../settings/experimental_features.dart';
/// App workspaces are bundled with Harness, not installed from the registry.
-/// Their Store presence follows the current account's confirmed experiment.
+/// Devices is always listed on the desktop app; an experimental one follows the
+/// current account's confirmed experiment.
enum ExperimentalStoreHarness {
devices(
- ExperimentalFeature.devicesTab,
+ null,
DshEntry(
id: 'autonomous/devices',
name: 'Devices',
@@ -31,13 +35,19 @@ enum ExperimentalStoreHarness {
);
const ExperimentalStoreHarness(this.feature, this.entry);
- final ExperimentalFeature feature;
+
+ /// The account experiment that gates this workspace, or null when it ships
+ /// to everyone the platform allows.
+ final ExperimentalFeature? feature;
final DshEntry entry;
- bool enabled(ExperimentalFeaturesStore features) =>
+ bool enabled(ExperimentalFeaturesStore features) => switch (feature) {
+ null => !kIsWeb && !kViewerMode,
+ final feature =>
feature.available &&
- features.isAvailable(feature) &&
- features.enabled(feature);
+ features.isAvailable(feature) &&
+ features.enabled(feature),
+ };
static ExperimentalStoreHarness? forId(String id) =>
values.where((harness) => harness.entry.id == id).firstOrNull;
diff --git a/desktop/test/agent_change_test.dart b/desktop/test/agent_change_test.dart
index 10775f13b..a2b0c4e9e 100644
--- a/desktop/test/agent_change_test.dart
+++ b/desktop/test/agent_change_test.dart
@@ -243,10 +243,6 @@ void main() {
);
app.experimentalFeatures.bind('a', transport: AccountSettings('a'));
await app.experimentalFeatures.refresh();
- await app.experimentalFeatures.set(
- ExperimentalFeature.devicesTab,
- true,
- );
app.stateOf('m')!.dsh.replace(const []);
app.openDevices();
await app.showDevicesTerminal('m', 'a0');
diff --git a/desktop/test/devices_harness_test.dart b/desktop/test/devices_harness_test.dart
index e74ca6442..e8fc7acb1 100644
--- a/desktop/test/devices_harness_test.dart
+++ b/desktop/test/devices_harness_test.dart
@@ -30,7 +30,6 @@ void main() {
);
app.experimentalFeatures.bind('a', transport: AccountSettings('a'));
await app.experimentalFeatures.refresh();
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, true);
app.openDevices();
devices = DevicesHarnessController(app);
});
@@ -162,7 +161,8 @@ void main() {
);
connection.holdCreation!.complete();
await opening;
- expect(app.swarms.any((tab) => tab.isDevices), isFalse);
+ // Devices is not an account opt-in, so its tab may stay; the old account's
+ // conversation must not be attached to it.
expect(app.allPanes.where((pane) => pane.agentId == 'manager'), isEmpty);
await devices.open();
expect(connection.creations.length, lessThanOrEqualTo(1));
diff --git a/desktop/test/devices_hosts_test.dart b/desktop/test/devices_hosts_test.dart
index a3ba8d6c8..95b301dfa 100644
--- a/desktop/test/devices_hosts_test.dart
+++ b/desktop/test/devices_hosts_test.dart
@@ -104,7 +104,6 @@ void main() {
}
app.experimentalFeatures.bind('a', transport: AccountSettings('a'));
await app.experimentalFeatures.refresh();
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, true);
final controller = DevicesController(
hosts: app.deviceHosts,
accountId: 'a',
@@ -196,7 +195,6 @@ void main() {
);
app.experimentalFeatures.bind('a', transport: AccountSettings('a'));
await app.experimentalFeatures.refresh();
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, true);
connection.unsupported = true;
await app.refreshDevices();
expect(app.deviceHosts.host('m')!.available, isFalse);
diff --git a/desktop/test/devices_tab_test.dart b/desktop/test/devices_tab_test.dart
index 670a422b6..3a903841e 100644
--- a/desktop/test/devices_tab_test.dart
+++ b/desktop/test/devices_tab_test.dart
@@ -13,27 +13,14 @@ import 'swarm_state_test.dart' show MemoryStore, createApp;
void main() {
for (final composerInBox in [false, true]) {
testWidgets(
- 'Devices stays hidden until enabled and owns focus (composerInBox=$composerInBox)',
+ 'Devices is there without an experiment and owns focus (composerInBox=$composerInBox)',
(tester) async {
newHarnessOpensInBox = composerInBox;
addTearDown(() => newHarnessOpensInBox = false);
final storage = MemoryStore();
final app = createApp(store: storage);
- app.experimentalFeatures.bind(
- 'u1',
- transport: MemoryExperimentalTransport(storage),
- );
- await app.experimentalFeatures.refresh();
await mount(tester, app);
final button = find.byKey(const ValueKey('swarm-devices-button'));
- expect(button, findsNothing);
- app.openDevices();
- expect(app.activeSwarm.isDevices, isFalse);
- await app.experimentalFeatures.set(
- ExperimentalFeature.devicesTab,
- true,
- );
- await tester.pumpAndSettle();
expect(button, findsOneWidget);
expect(
tester.getCenter(button).dx,
@@ -85,49 +72,12 @@ void main() {
);
expect(left.right, lessThan(right.left));
expect(left.width / (left.width + right.width), closeTo(.7, .01));
- await app.experimentalFeatures.set(
- ExperimentalFeature.devicesTab,
- false,
- );
- await tester.pumpAndSettle();
- expect(button, findsNothing);
- expect(app.swarms.any((s) => s.isDevices), isFalse);
- expect(find.text('Add your first device'), findsNothing);
- await app.experimentalFeatures.set(
- ExperimentalFeature.devicesTab,
- true,
- );
- app.openDevices();
- await tester.pumpAndSettle();
- app.currentUser = const CurrentUserProfile(
- id: 'u2',
- email: '[email protected]',
- );
- await tester.pumpAndSettle();
- expect(button, findsNothing);
- expect(app.swarms.any((s) => s.isDevices), isFalse);
- expect(find.text('Add your first device'), findsNothing);
await tester.pumpWidget(const SizedBox());
app.dispose();
},
);
}
- test(
- 'a saved Devices tab cannot appear when the experiment is off',
- () async {
- final storage = MemoryStore();
- await PaneLayoutStore(storage: storage).saveSwarms([
- Swarm(id: 'devices', name: 'Devices', kind: 'devices'),
- Swarm(id: 'work', name: 'Work'),
- ], 'devices');
- final app = createApp(store: storage);
- await app.restorePaneLayoutForTest();
- expect(app.swarms.any((s) => s.isDevices), isFalse);
- app.dispose();
- },
- );
-
test(
'restoring a Devices tab reserves chat before its conversation loads',
() async {
@@ -136,12 +86,6 @@ void main() {
Swarm(id: 'devices', name: 'Devices', kind: 'devices'),
], 'devices');
final app = createApp(store: storage);
- app.experimentalFeatures.bind(
- 'u1',
- transport: MemoryExperimentalTransport(storage),
- );
- await app.experimentalFeatures.refresh();
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, true);
await app.restorePaneLayoutForTest();
final tab = app.swarms.singleWhere((tab) => tab.isDevices);
expect(tab.panes, hasLength(2));
@@ -152,19 +96,15 @@ void main() {
},
);
- test(
- 'older servers keep existing experiments working with Devices unavailable',
- () async {
- final store = ExperimentalFeaturesStore(pollInterval: Duration.zero);
- store.bind('u1', transport: _OldServer());
- await store.refresh();
- expect(store.loaded, isTrue);
- expect(store.enabled(ExperimentalFeature.shareButton), isTrue);
- expect(store.enabled(ExperimentalFeature.devicesTab), isFalse);
- expect(store.isAvailable(ExperimentalFeature.devicesTab), isFalse);
- store.dispose();
- },
- );
+ test('a server still sending the retired devices_tab flag keeps experiments working', () async {
+ final store = ExperimentalFeaturesStore(pollInterval: Duration.zero);
+ store.bind('u1', transport: _OldServer());
+ await store.refresh();
+ expect(store.loaded, isTrue);
+ expect(store.error, isNull);
+ expect(store.enabled(ExperimentalFeature.shareButton), isTrue);
+ store.dispose();
+ });
}
class _OldServer implements ExperimentalSettingsTransport {
@@ -172,7 +112,11 @@ class _OldServer implements ExperimentalSettingsTransport {
Future<Map<String, dynamic>> read() async => {
'accountId': 'u1',
'revision': 1,
- 'features': {'focus_bar_creature': false, 'share_button': true},
+ 'features': {
+ 'focus_bar_creature': false,
+ 'share_button': true,
+ 'devices_tab': false,
+ },
};
@override
Future<Map<String, dynamic>> write(
diff --git a/desktop/test/store_experiments_test.dart b/desktop/test/store_experiments_test.dart
index 48302c952..f71d54d34 100644
--- a/desktop/test/store_experiments_test.dart
+++ b/desktop/test/store_experiments_test.dart
@@ -106,6 +106,9 @@ Future<AccountSettings> _bind(ExperimentalFeaturesStore features) async {
return server;
}
+/// The Store workspaces still behind an account experiment. Devices is not one.
+final _gated = ExperimentalStoreHarness.values.where((h) => h.feature != null);
+
void main() {
TestWidgetsFlutterBinding.ensureInitialized();
setUpAll(() async {
@@ -118,45 +121,53 @@ void main() {
.load();
});
- test('each confirmed flag controls its own listing, including advertised records', () async {
- final features = ExperimentalFeaturesStore(pollInterval: Duration.zero);
- addTearDown(features.dispose);
- List<DshEntry> visible() =>
- storeVisibleHarnesses(_advertised, features).toList();
- expect(visible(), [_ordinary]);
- final server = await _bind(features);
- expect(visible(), [_ordinary]);
- for (final harness in ExperimentalStoreHarness.values) {
- final ack = Completer<Map<String, dynamic>>();
- server.writeOverride = () => ack.future;
- final saving = features.set(harness.feature, true);
+ test(
+ 'Devices is always listed; each confirmed flag controls its own listing',
+ () async {
+ final features = ExperimentalFeaturesStore(pollInterval: Duration.zero);
+ addTearDown(features.dispose);
+ List<DshEntry> visible() =>
+ storeVisibleHarnesses(_advertised, features).toList();
+ const devices = ExperimentalStoreHarness.devices;
expect(visible(), [
_ordinary,
- ], reason: 'Wait for account acknowledgement');
- server.features[harness.feature.id] = true;
- server.revision++;
- ack.complete(server.snapshot);
- await saving;
- expect(visible(), [_ordinary, harness.entry]);
- server.writeOverride = null;
- await features.set(harness.feature, false);
- expect(visible(), [_ordinary]);
- }
- for (final harness in ExperimentalStoreHarness.values) {
- await features.set(harness.feature, true);
- }
- expect(visible().map((entry) => entry.name), [
- 'Marp',
- 'Devices',
- 'Companions',
- ]);
- await features.set(ExperimentalFeature.devicesTab, false);
- expect(visible().map((entry) => entry.name), ['Marp', 'Companions']);
- features.bind('account-b');
- expect(visible(), [
- _ordinary,
- ], reason: 'Never inherit another account’s flags');
- });
+ devices.entry,
+ ], reason: 'Devices needs no account and no experiment');
+ final server = await _bind(features);
+ expect(visible(), [_ordinary, devices.entry]);
+ for (final harness in _gated) {
+ final feature = harness.feature!;
+ final ack = Completer<Map<String, dynamic>>();
+ server.writeOverride = () => ack.future;
+ final saving = features.set(feature, true);
+ expect(visible(), [
+ _ordinary,
+ devices.entry,
+ ], reason: 'Wait for account acknowledgement');
+ server.features[feature.id] = true;
+ server.revision++;
+ ack.complete(server.snapshot);
+ await saving;
+ expect(visible(), [_ordinary, devices.entry, harness.entry]);
+ server.writeOverride = null;
+ await features.set(feature, false);
+ expect(visible(), [_ordinary, devices.entry]);
+ }
+ for (final harness in _gated) {
+ await features.set(harness.feature!, true);
+ }
+ expect(visible().map((entry) => entry.name), [
+ 'Marp',
+ 'Devices',
+ 'Companions',
+ ]);
+ features.bind('account-b');
+ expect(visible(), [
+ _ordinary,
+ devices.entry,
+ ], reason: 'Never inherit another account’s flags');
+ },
+ );
test(
'unavailable experiments and failed saves cannot reveal a listing',
@@ -164,17 +175,25 @@ void main() {
final features = ExperimentalFeaturesStore(pollInterval: Duration.zero);
addTearDown(features.dispose);
final server = await _bind(features);
+ const devices = ExperimentalStoreHarness.devices;
+ const feature = ExperimentalFeature.focusBarCreature;
server.writeOverride = () async => throw StateError('offline');
- await features.set(ExperimentalFeature.devicesTab, true);
- expect(storeVisibleHarnesses(_advertised, features), [_ordinary]);
- server.features[ExperimentalFeature.devicesTab.id] = true;
+ await features.set(feature, true);
+ expect(storeVisibleHarnesses(_advertised, features), [
+ _ordinary,
+ devices.entry,
+ ]);
+ server.features[feature.id] = true;
server.revision++;
server.readOverride = () async => {
...server.snapshot,
- 'available': {ExperimentalFeature.devicesTab.id: false},
+ 'available': {feature.id: false},
};
await features.refresh();
- expect(storeVisibleHarnesses(_advertised, features), [_ordinary]);
+ expect(storeVisibleHarnesses(_advertised, features), [
+ _ordinary,
+ devices.entry,
+ ]);
},
);
@@ -188,9 +207,9 @@ void main() {
final search = SwarmSearchController(app, [])..setQuery('*');
addTearDown(search.dispose);
expect(search.isStoreMode, isTrue);
- expect(search.storeEntries.keys, [_ordinary.id]);
- for (final harness in ExperimentalStoreHarness.values) {
- await app.experimentalFeatures.set(harness.feature, true);
+ expect(search.storeEntries.keys, [_ordinary.id, 'autonomous/devices']);
+ for (final harness in _gated) {
+ await app.experimentalFeatures.set(harness.feature!, true);
}
expect(
search.storeEntries.keys,
@@ -208,7 +227,7 @@ void main() {
);
expect(search.storeEntries, contains('autonomous/devices'));
app.experimentalFeatures.bind(null);
- expect(search.storeEntries.keys, [_ordinary.id]);
+ expect(search.storeEntries.keys, [_ordinary.id, 'autonomous/devices']);
});
Future<_App> mount(
@@ -242,11 +261,11 @@ void main() {
..dsh.replace(_advertised);
}
await _bind(app.experimentalFeatures);
- if (id != null && enabled) {
- await app.experimentalFeatures.set(
- ExperimentalStoreHarness.forId(id)!.feature,
- true,
- );
+ final feature = id == null
+ ? null
+ : ExperimentalStoreHarness.forId(id)!.feature;
+ if (feature != null && enabled) {
+ await app.experimentalFeatures.set(feature, true);
}
app.openStore();
await tester.pumpWidget(
@@ -287,14 +306,17 @@ void main() {
.entries
.map((entry) => entry.id)
.toList();
- expect(ids(), isNot(contains('autonomous/devices')));
+ expect(ids(), contains('autonomous/devices'));
expect(ids(), isNot(contains('autonomous/pair')));
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, true);
+ await app.experimentalFeatures.set(
+ ExperimentalFeature.focusBarCreature,
+ true,
+ );
await tester.pumpAndSettle();
expect(ids(), contains('autonomous/devices'));
- expect(ids(), isNot(contains('autonomous/pair')));
+ expect(ids(), contains('autonomous/pair'));
// Open from Store discovery; its canonical product identity is stable.
- final card = find.byKey(const ValueKey('store-card:autonomous/devices'));
+ final card = find.byKey(const ValueKey('store-card:autonomous/pair'));
await tester.ensureVisible(card);
await tester.tap(card);
await tester.pumpAndSettle();
@@ -304,38 +326,44 @@ void main() {
find.byKey(const ValueKey('store-primary-action')),
)
.onPressed!;
- await app.experimentalFeatures.set(ExperimentalFeature.devicesTab, false);
+ await app.experimentalFeatures.set(
+ ExperimentalFeature.focusBarCreature,
+ false,
+ );
// An already captured callback must be harmless even before the next frame.
oldOpen();
expect(app.activeSwarm.isStore, isTrue);
await tester.pumpAndSettle();
expect(find.text('Open'), findsNothing);
- expect(ids(), isNot(contains('autonomous/devices')));
+ expect(ids(), isNot(contains('autonomous/pair')));
+ expect(ids(), contains('autonomous/devices'));
await tester.pumpWidget(const SizedBox());
},
);
for (final harness in ExperimentalStoreHarness.values) {
- testWidgets(
- 'a disabled ${harness.entry.name} deep link cannot expose its page',
- (tester) async {
- final app = await mount(tester, id: harness.entry.id, enabled: false);
- expect(find.byType(StoreDiscover), findsOneWidget);
- expect(
- find.byKey(const ValueKey('store-primary-action')),
- findsNothing,
- );
- await openStoreAgent(
- tester.element(find.byType(StoreTab)),
- app,
- harness.entry.id,
- 'm',
- );
- expect(app.activeSwarm.isStore, isTrue);
- expect(app.swarms, hasLength(1));
- await tester.pumpWidget(const SizedBox());
- },
- );
+ if (harness.feature != null) {
+ testWidgets(
+ 'a disabled ${harness.entry.name} deep link cannot expose its page',
+ (tester) async {
+ final app = await mount(tester, id: harness.entry.id, enabled: false);
+ expect(find.byType(StoreDiscover), findsOneWidget);
+ expect(
+ find.byKey(const ValueKey('store-primary-action')),
+ findsNothing,
+ );
+ await openStoreAgent(
+ tester.element(find.byType(StoreTab)),
+ app,
+ harness.entry.id,
+ 'm',
+ );
+ expect(app.activeSwarm.isStore, isTrue);
+ expect(app.swarms, hasLength(1));
+ await tester.pumpWidget(const SizedBox());
+ },
+ );
+ }
for (final local in [false, true]) {
testWidgets(
'${harness.entry.name} opens and reuses its app workspace (local=$local)',
diff --git a/desktop/tool/devices_preview.dart b/desktop/tool/devices_preview.dart
index 1b62409cf..220ade271 100644
--- a/desktop/tool/devices_preview.dart
+++ b/desktop/tool/devices_preview.dart
@@ -66,8 +66,7 @@ class DevicesReviewStorage implements LocalKeyValueStore {
class _Experiments implements ExperimentalSettingsTransport {
final features = {
- for (final feature in ExperimentalFeature.values)
- feature.id: feature == ExperimentalFeature.devicesTab,
+ for (final feature in ExperimentalFeature.values) feature.id: false,
};
int revision = 0;
@override
@@ -430,18 +429,6 @@ class _PreviewState extends State<_Preview> {
),
),
),
- TextButton(
- onPressed: switching
- ? null
- : () async {
- await app.experimentalFeatures.set(
- ExperimentalFeature.devicesTab,
- !app.devicesEnabled,
- );
- if (app.devicesEnabled) app.openDevices();
- },
- child: const Text('Toggle experiment'),
- ),
],
),
),