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.

fix(mobile): clearer onboarding copy and Scan again on failed pairing

tony481f224cdbab
diff --git a/mobile/lib/logging/startup_trace.dart b/mobile/lib/logging/startup_trace.dart
index 8217b44ec..2586f0803 100644
--- a/mobile/lib/logging/startup_trace.dart
+++ b/mobile/lib/logging/startup_trace.dart
@@ -8,7 +8,7 @@ import 'app_log.dart';
/// of it, and only then the agent list. Every one of those is a plausible
/// suspect for a slow start, and until each is timed separately the only honest
/// answer to "why is it slow" is a guess. The screen says
-/// "Connecting to your machine…" for all of them at once (see
+/// "Connecting to your computer…" for all of them at once (see
/// `phone/phone_status.dart`), so the UI cannot be read as a progress bar
/// either.
///
diff --git a/mobile/lib/phone/agent_home.dart b/mobile/lib/phone/agent_home.dart
index c3524fdb0..3b22890f1 100644
--- a/mobile/lib/phone/agent_home.dart
+++ b/mobile/lib/phone/agent_home.dart
@@ -357,7 +357,7 @@ class _AgentHomeState extends State<AgentHome> {
bool _waitingForRestore = false;
/// Whether that wait is for the agent's own terminal rather than for its machine — see
- /// [_terminalStillComing]. Only the message differs; saying "Connecting to your machine…" over a
+ /// [_terminalStillComing]. Only the message differs; saying "Connecting to your computer…" over a
/// machine that has already answered names the wrong thing to be patient with.
bool _waitingForTerminal = false;
@@ -369,8 +369,8 @@ class _AgentHomeState extends State<AgentHome> {
if (_waitingForTerminal) return 'Reopening your harness…';
// Every other machine may be up and loaded while the one holding the remembered agent is still
// dialling — without this the wait would draw as "No agents yet".
- if (_waitingForRestore) return 'Connecting to your machine…';
- if (_waitingForDesk) return 'Opening your swarms…';
+ if (_waitingForRestore) return 'Connecting to your computer…';
+ if (_waitingForDesk) return 'Opening your tabs…';
return null;
}
@@ -534,7 +534,7 @@ class _AgentHomeState extends State<AgentHome> {
/// This is the wait as the PERSON experiences it, which is the only timeline
/// that settles whether a launch is slow: everything else in the log measures
/// one operation, while this measures how long the phone showed a given
- /// sentence. "Connecting to your machine…" covers a dial, an E2EE handshake
+ /// sentence. "Connecting to your computer…" covers a dial, an E2EE handshake
/// and an agent list (see `phone_status.dart`), so the gap between this line
/// and the next is the only place that stretch appears as a number at all.
///
@@ -569,7 +569,7 @@ class _AgentHomeState extends State<AgentHome> {
final notifier = widget.notifier;
// Then the account's machines, over the network.
if (notifier.machines.isEmpty) {
- return notifier.machinesLoading ? 'Looking for your machines…' : null;
+ return notifier.machinesLoading ? 'Looking for your computers…' : null;
}
final machines = filterableMachines(notifier);
// ⚠️ **The first machine to answer ends the wait; the others catch up behind
@@ -602,7 +602,7 @@ class _AgentHomeState extends State<AgentHome> {
PhoneMachineStatus.ready || PhoneMachineStatus.offline => false,
},
)) {
- return 'Connecting to your machine…';
+ return 'Connecting to your computer…';
}
// And finally the agent list a connected machine still owes. ⚠️ Only from machines that are
// READY: an offline one is left at whatever `agentLoadStatus` it had when it dropped, and
diff --git a/mobile/lib/phone/approve_sign_in.dart b/mobile/lib/phone/approve_sign_in.dart
index ffcce24da..f3ff275e0 100644
--- a/mobile/lib/phone/approve_sign_in.dart
+++ b/mobile/lib/phone/approve_sign_in.dart
@@ -161,8 +161,8 @@ class _ApproveDialog extends StatelessWidget {
const SizedBox(height: 14),
Text(
computer
- ? 'A computer, to your account — it will run your agents and reach your machines.'
- : 'An app, to your account — it will reach your machines.',
+ ? 'A computer, to your account — it will run your agents and reach your other computers.'
+ : 'An app, to your account — it will reach your computers.',
style: text,
),
const SizedBox(height: 10),
diff --git a/mobile/lib/phone/phone_shell.dart b/mobile/lib/phone/phone_shell.dart
index 5ac40df23..421059f71 100644
--- a/mobile/lib/phone/phone_shell.dart
+++ b/mobile/lib/phone/phone_shell.dart
@@ -142,7 +142,7 @@ class _PhoneShellState extends State<PhoneShell> with WidgetsBindingObserver {
/// given. Spent here whatever the answer — a code is one computer's sign-in, once.
///
/// From this shell's context and not a page's: the home page under it is still settling (the
- /// machines loading, "Waiting for your computer…" swapping with "Looking for your machines…") and
+ /// machines loading, "Waiting for your computer…" swapping with "Looking for your computers…") and
/// a page swapped out mid-answer would drop it. The dialog stands on the root navigator either way.
void _approveHeldComputerSignIn() {
final code = widget.notifier.pendingComputerSignIn;
diff --git a/mobile/lib/phone/phone_status.dart b/mobile/lib/phone/phone_status.dart
index e74a4dd9d..70516b5a7 100644
--- a/mobile/lib/phone/phone_status.dart
+++ b/mobile/lib/phone/phone_status.dart
@@ -44,7 +44,7 @@ PhoneMachineStatus phoneMachineStatusOf(MachineState machine) {
/// ⚠️ **The second half is what keeps a terminal on screen through a dropped socket.** Backgrounding
/// the app drops it every time, and a machine counted only while [PhoneMachineStatus.ready] took its
/// agents out of the list for the length of the redial — the pager, whose pages ARE that list, was
-/// thrown away and the screen fell back to "Connecting to your machine…" on every return to the app.
+/// thrown away and the screen fell back to "Connecting to your computer…" on every return to the app.
/// A first connect has no list yet, so it still waits like one.
/// ⚠️ **Agents restored from the last run count too, and that is the whole
/// point of restoring them.** A warm-started machine is `connecting` (its socket
diff --git a/mobile/lib/phone/welcome/connect_computer.dart b/mobile/lib/phone/welcome/connect_computer.dart
index 6249e03d9..ae1ab2ada 100644
--- a/mobile/lib/phone/welcome/connect_computer.dart
+++ b/mobile/lib/phone/welcome/connect_computer.dart
@@ -25,7 +25,10 @@ import 'set_up_computer.dart';
///
/// Send it to your computer: (the download menu)
/// …
-/// Then open it, sign in with Google or Apple, and scan the code in Add Phone….
+/// Then, on your computer:
+/// 1 Install Harness, and open it.
+/// 2 Sign in with Google or Apple, as ada@… — the account on this phone.
+/// 3 Open Add Phone… and scan its code. On a Mac, it’s in the Harness menu.
/// Scan to connect ›
/// See how it works ▶
/// Try the sample while you wait
@@ -112,7 +115,8 @@ class _ConnectComputerPageState extends State<ConnectComputerPage> {
final machineId = code.machineId, pairCode = code.pairCode;
if (machineId == null || pairCode == null) {
_say(
- "That code can't pair a computer. Scan the one in Harness ▸ Add Phone….",
+ 'That isn’t an Add Phone code. Open Add Phone… on the computer and '
+ 'scan its code.',
failed: true,
);
return;
@@ -173,6 +177,8 @@ class _ConnectComputerPageState extends State<ConnectComputerPage> {
onBack: widget.onBack,
onScan: () => unawaited(_scanToPair()),
loadDownloads: widget.loadDownloads,
+ // The computer has to join this account, so the steps name it.
+ account: widget.signedIn ? email : null,
status: widget.signedIn || scanned != null
? Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
diff --git a/mobile/lib/phone/welcome/pairing_with_code.dart b/mobile/lib/phone/welcome/pairing_with_code.dart
index a23d72eed..43b513a94 100644
--- a/mobile/lib/phone/welcome/pairing_with_code.dart
+++ b/mobile/lib/phone/welcome/pairing_with_code.dart
@@ -8,6 +8,7 @@ import 'package:harness_mobile/state/app_state.dart';
import '../tty.dart';
import '../tty_controls.dart';
+import 'scan_to_connect.dart';
/// The moment after signing in from a scanned "Add phone" QR: the phone pairs with the computer by
/// the QR's one-time code ([AppNotifier.connectWithCode]) — no password — while this says so.
@@ -17,8 +18,10 @@ import '../tty_controls.dart';
/// Keep “Add Phone” open on MacBook Pro.
/// ```
///
-/// On success the computer unlocks and the home screen moves on by itself. On failure the code is
-/// spent: the reason is shown, with the computer's password as the way on.
+/// On success the computer unlocks and the home screen moves on by itself. On failure the reason is
+/// shown, and the way on is the one it names: **Scan again** — Add Phone shows a new code after
+/// one that did not match, and keeps its code up after a phone that went quiet. The computer's
+/// password is under it, for a computer whose Add Phone is not to hand.
class PairingWithCode extends StatefulWidget {
const PairingWithCode({
super.key,
@@ -38,17 +41,17 @@ class PairingWithCode extends StatefulWidget {
class _PairingWithCodeState extends State<PairingWithCode> {
String? _error;
+ /// The camera is up for [_scanAgain]: a second tap does not open another.
+ bool _scanning = false;
+
@override
void initState() {
super.initState();
- unawaited(_pair());
+ unawaited(_pair(widget.code));
}
- Future<void> _pair() async {
- final error = await widget.notifier.connectWithCode(
- widget.machineId,
- widget.code,
- );
+ Future<void> _pair(String code) async {
+ final error = await widget.notifier.connectWithCode(widget.machineId, code);
if (!mounted) return;
if (error == null) {
HapticFeedback.mediumImpact();
@@ -58,6 +61,45 @@ class _PairingWithCodeState extends State<PairingWithCode> {
setState(() => _error = error);
}
+ /// What every one of these errors tells the person to do — "Scan the new one", "scan again" —
+ /// and which this screen used to offer no button for: only the password, which somebody adding
+ /// their first phone has never set.
+ ///
+ /// Only a code of THIS computer is taken: the screen is its, and the home screen moves on by
+ /// itself once it is unlocked. Back from the camera with nothing leaves the error as it was.
+ Future<void> _scanAgain(String name) async {
+ if (_scanning) return;
+ setState(() => _scanning = true);
+ final scanned = await scanForCode(context, fallbackLabel: 'Not now');
+ if (!mounted) return;
+ setState(() => _scanning = false);
+ if (scanned == null) return;
+ final pairCode = scanned.pairCode;
+ if (scanned.machineId == null || pairCode == null) {
+ setState(
+ () => _error =
+ 'That isn’t an Add Phone code. Open Add Phone… on $name and scan '
+ 'its code.',
+ );
+ return;
+ }
+ if (scanned.machineId != widget.machineId) {
+ setState(
+ () => _error =
+ 'That code is for another computer. Scan the one on $name.',
+ );
+ return;
+ }
+ // Held as the code this phone is pairing by, as the first one was, so nothing that reads it
+ // meanwhile finds the spent one.
+ widget.notifier.pendingPairing = (
+ machineId: widget.machineId,
+ code: pairCode,
+ );
+ setState(() => _error = null);
+ await _pair(pairCode);
+ }
+
/// The code is spent either way: the computer's password form is what is left.
void _usePassword() => widget.notifier.dropPendingPairing();
@@ -107,11 +149,23 @@ class _PairingWithCodeState extends State<PairingWithCode> {
),
),
const Spacer(),
- if (error != null)
+ if (error != null) ...[
TtyPrimaryButton(
- label: 'Use its password instead',
- onPressed: _usePassword,
+ key: const ValueKey('pairing-scan-again'),
+ label: 'Scan again',
+ onPressed: _scanning
+ ? null
+ : () => unawaited(_scanAgain(name)),
+ ),
+ const SizedBox(height: 4),
+ Center(
+ child: TtyTextButton(
+ label: 'Use its password instead',
+ color: tty.faint,
+ onPressed: _scanning ? null : _usePassword,
+ ),
),
+ ],
],
),
),
diff --git a/mobile/lib/phone/welcome/phone_welcome.dart b/mobile/lib/phone/welcome/phone_welcome.dart
index 989ca9347..3713c56a4 100644
--- a/mobile/lib/phone/welcome/phone_welcome.dart
+++ b/mobile/lib/phone/welcome/phone_welcome.dart
@@ -105,10 +105,12 @@ class _PhoneWelcomeState extends State<PhoneWelcome> {
bool _codeFromScan = false;
/// Under the scan page's hint. A desktop app opens signed out (its guest mode), and its Add Phone
- /// then shows no code, only "Sign in to add your phone." — with no way to sign in from there.
+ /// then shows no code, only "Sign in to add your phone." — with a Sign in… button beside it in
+ /// a current desktop app, and none in an older one, where Settings ▸ Account is the way.
static const _signInThereFirst =
- 'Does it say “Sign in to add your phone”? Sign in on the computer first '
- '(Settings ▸ Account, with Google or Apple), then open Add Phone… again.';
+ 'Does it say “Sign in to add your phone”? Sign in on the computer with '
+ 'Google or Apple (Sign in… right there, or Settings ▸ Account), then '
+ 'scan its code.';
String? _error;
int _resendIn = 0;
diff --git a/mobile/lib/phone/welcome/scan_to_connect.dart b/mobile/lib/phone/welcome/scan_to_connect.dart
index 654ce7ff0..e17b569ff 100644
--- a/mobile/lib/phone/welcome/scan_to_connect.dart
+++ b/mobile/lib/phone/welcome/scan_to_connect.dart
@@ -14,6 +14,13 @@ import '../tty.dart';
import '../tty_controls.dart';
import 'connect_code.dart';
+/// Where Add Phone… is on the computer, for somebody who has never opened it. The Mac keeps it in
+/// the Harness menu; the desktop app's Linux menu strip has no row for it, so there it is the
+/// command palette's (`navigation.commands`, Ctrl+Shift+P, finds the "Add phone" command).
+const kAddPhoneWhere =
+ 'On a Mac: Harness menu ▸ Add Phone…\n'
+ 'On Linux: Ctrl+Shift+P, then “add phone”';
+
/// **Yes — scan to connect**: the camera, reading the code the desktop app shows under
/// Harness ▸ Add Phone… ([ConnectCode]). The scan signs the phone in; [signingIn] says so while it
/// does.
@@ -24,7 +31,8 @@ import 'connect_code.dart';
/// │ [ camera view ] │
/// └──────────────────────┘
/// Scan the code on your computer
-/// In Harness on your computer: Add Phone…
+/// On a Mac: Harness menu ▸ Add Phone…
+/// On Linux: Ctrl+Shift+P, then “add phone”
///
/// Use email instead
/// ```
@@ -45,9 +53,10 @@ class ScanToConnectPage extends StatefulWidget {
this.onSignInCode,
this.acceptConnectCodes = true,
this.title = 'Scan the code on your computer',
- // Not "On your Mac: Harness ▸ Add Phone…": the desktop app runs on Linux too, where Add Phone
- // is in the command palette rather than a Harness menu.
- this.hint = 'In Harness on your computer: Add Phone…',
+ // Where it is on each, not "In Harness on your computer: Add Phone…": someone who has never
+ // opened the desktop app does not know where Add Phone lives, and it is not in the same place
+ // on a Mac and on Linux.
+ this.hint = kAddPhoneWhere,
this.note,
});
@@ -229,21 +238,22 @@ class _ScanToConnectPageState extends State<ScanToConnectPage>
),
),
const SizedBox(height: 24),
+ // Texts that wrap, not one-line TtyTexts: at a narrow phone's width the title and the
+ // hint's second half were cut off at the screen's edge — the half that says where to look.
Padding(
padding: const EdgeInsets.symmetric(horizontal: Tty.origin),
- child: TtyText(
+ child: Text(
widget.signingIn ? 'Signing in…' : widget.title,
- size: TtySize.title,
- weight: FontWeight.w600,
+ style: tty.style(size: TtySize.title, weight: FontWeight.w600),
),
),
const SizedBox(height: 6),
Padding(
padding: const EdgeInsets.symmetric(horizontal: Tty.origin),
- child: TtyText(
+ child: Text(
widget.hint,
- color: tty.faint,
- size: TtySize.meta,
+ key: const ValueKey('scan-hint'),
+ style: tty.style(size: TtySize.meta, color: tty.faint),
),
),
const SizedBox(height: 10),
@@ -252,14 +262,17 @@ class _ScanToConnectPageState extends State<ScanToConnectPage>
Padding(
padding: const EdgeInsets.symmetric(horizontal: Tty.origin),
child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Icon(LucideIcons.lock300, size: 13, color: tty.faint),
+ Padding(
+ padding: const EdgeInsets.only(top: 2),
+ child: Icon(LucideIcons.lock300, size: 13, color: tty.faint),
+ ),
const SizedBox(width: 6),
Expanded(
- child: TtyText(
+ child: Text(
'End-to-end encrypted, phone to computer.',
- color: tty.faint,
- size: TtySize.meta,
+ style: tty.style(size: TtySize.meta, color: tty.faint),
),
),
],
diff --git a/mobile/lib/phone/welcome/set_up_computer.dart b/mobile/lib/phone/welcome/set_up_computer.dart
index b6fc109fa..651cbc4d0 100644
--- a/mobile/lib/phone/welcome/set_up_computer.dart
+++ b/mobile/lib/phone/welcome/set_up_computer.dart
@@ -34,15 +34,22 @@ typedef DesktopPlatform = ({
IconData icon,
});
-/// The website's download menu (autonomous.ai/harness-app), row for row.
+/// The website's download menu (autonomous.ai/harness-app), row for row — with a word more on
+/// the two Macs, for somebody who never had to know which theirs is: Apple Silicon is every
+/// M-series Mac.
const kDesktopPlatforms = <DesktopPlatform>[
(
key: 'desktop-macos-arm64-dmg',
label: 'macOS',
- note: 'Apple Silicon',
+ note: 'Apple Silicon · M1 or later',
+ icon: Icons.apple,
+ ),
+ (
+ key: 'desktop-macos-dmg',
+ label: 'macOS',
+ note: 'Intel · older Macs',
icon: Icons.apple,
),
- (key: 'desktop-macos-dmg', label: 'macOS', note: 'Intel', icon: Icons.apple),
(
key: 'desktop-linux-x64',
label: 'Linux',
@@ -96,19 +103,22 @@ Future<Map<String, String>> loadDesktopDownloads({Dio? dio}) async {
/// Send it to your computer:
/// ┌──────────────────────────────────────┐
/// │ macOS ⇪ │
-/// │ Apple Silicon │
+/// │ Apple Silicon · M1 or later │
/// │ macOS ⇪ │
-/// │ Intel │
+/// │ Intel · older Macs │
/// │ Linux ⇪ │
/// │ Intel/AMD · Ubuntu, Omarchy and more│
/// │ Linux ⇪ │
/// │ ARM · Raspberry Pi, ARM servers │
-/// │ CLI ⧉ │
+/// │ Command line ⧉ │
/// │ curl -fsSL …/install.sh | bash │
/// └──────────────────────────────────────┘
/// or open harness.autonomous.ai/desktop there.
///
-/// Then open it, sign in with Google or Apple, and scan the code in Add Phone….
+/// Then, on your computer:
+/// 1 Install Harness, and open it.
+/// 2 Sign in with Google or Apple.
+/// 3 Open Add Phone… and scan its code. On a Mac, it’s in the Harness menu.
/// Scan to connect ›
/// ```
class SetUpComputerPage extends StatefulWidget {
@@ -120,8 +130,14 @@ class SetUpComputerPage extends StatefulWidget {
this.status,
this.trailing = const [],
this.loadDownloads,
+ this.account,
});
+ /// The account this phone is signed in to, when it is: the computer has to sign in to the same
+ /// one, and the steps say so by name. Null for a phone not signed in yet — its scan signs it in
+ /// to whichever account the computer chose.
+ final String? account;
+
/// Back to the first screen's other answer, once the app is on the computer — or, signed in,
/// the scan that pairs this phone with the computer just set up.
final VoidCallback onScan;
@@ -186,6 +202,19 @@ class _SetUpComputerPageState extends State<SetUpComputerPage> {
});
}
+ /// What to do on the computer once the file is there. Signed in, the account is named: a
+ /// computer signed in to another one never shows up here, and nothing else on the page says so.
+ List<String> get _steps => [
+ 'Install Harness, and open it.',
+ switch (widget.account) {
+ final account? =>
+ 'Sign in with Google or Apple, as $account — the account on this '
+ 'phone.',
+ null => 'Sign in with Google or Apple.',
+ },
+ 'Open Add Phone… and scan its code. On a Mac, it’s in the Harness menu.',
+ ];
+
@override
Widget build(BuildContext context) {
AppTheme.watch(context);
@@ -259,7 +288,8 @@ class _SetUpComputerPageState extends State<SetUpComputerPage> {
),
_DownloadRow(
icon: LucideIcons.squareTerminal300,
- label: 'CLI',
+ // Not "CLI": the one row a newcomer would have to look up.
+ label: 'Command line',
note: _copied
? 'copied'
: 'curl -fsSL …/install.sh | bash',
@@ -291,11 +321,15 @@ class _SetUpComputerPageState extends State<SetUpComputerPage> {
// code until it is signed in — "Then open it, and scan the code it shows" sent people to
// an Add Phone that only said "Sign in to add your phone.". Google or Apple by name: its
// third way, "Scan with your phone", needs a phone that is already signed in.
- Text(
- 'Then open it, sign in with Google or Apple, and scan the code in Add Phone….',
- style: faint,
- ),
- const SizedBox(height: 4),
+ //
+ // Three numbered steps in the page's own ink, not one faint sentence: they are what the
+ // person does next, and folded into a line under the download menu they read as a
+ // footnote to it.
+ Text('Then, on your computer:', style: faint),
+ const SizedBox(height: 10),
+ for (final (index, step) in _steps.indexed)
+ _SetUpStep(number: index + 1, text: step),
+ const SizedBox(height: 2),
Align(
alignment: Alignment.centerLeft,
child: Transform.translate(
@@ -333,6 +367,40 @@ class _SetUpComputerPageState extends State<SetUpComputerPage> {
}
}
+/// One numbered step: the number in the terminal's green in a column of its own, the words beside
+/// it wrapping under themselves rather than under the number.
+class _SetUpStep extends StatelessWidget {
+ const _SetUpStep({required this.number, required this.text});
+
+ final int number;
+ final String text;
+
+ @override
+ Widget build(BuildContext context) {
+ final tty = Tty.of(context);
+ final style = tty.style(size: TtySize.row);
+ return Padding(
+ padding: const EdgeInsets.only(bottom: 8),
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // One digit in a monospace face: every number is the same width, so the steps' words
+ // line up without a column of fixed width that a larger text size would outgrow.
+ Text(
+ '$number',
+ style: style.copyWith(
+ color: tty.green,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ const SizedBox(width: 10),
+ Expanded(child: Text(text, style: style)),
+ ],
+ ),
+ );
+ }
+}
+
/// One row of the menu: its icon, what it is and for which computer, and what a tap does.
class _DownloadRow extends StatelessWidget {
const _DownloadRow({
diff --git a/mobile/lib/phone/welcome/unlock_computer.dart b/mobile/lib/phone/welcome/unlock_computer.dart
index 434d6d20f..e42e52aa0 100644
--- a/mobile/lib/phone/welcome/unlock_computer.dart
+++ b/mobile/lib/phone/welcome/unlock_computer.dart
@@ -134,7 +134,9 @@ class _UnlockComputerState extends State<UnlockComputer> {
final pairCode = code.pairCode;
if (code.machineId == null || pairCode == null) {
setState(
- () => _error = "That code can't unlock a computer. Scan the one in Harness ▸ Add Phone….",
+ () => _error =
+ 'That isn’t an Add Phone code. Open Add Phone… on '
+ '${machine.displayName} and scan its code.',
);
return;
}
@@ -180,8 +182,10 @@ class _UnlockComputerState extends State<UnlockComputer> {
),
const SizedBox(height: 12),
Text(
- // Not "Harness ▸ Add Phone…": that menu is the Mac's; on Linux it is the command palette.
- 'In Harness on $name, open Add Phone…, then scan the QR code.',
+ // Where Add Phone is, not only its name: the Harness menu is the Mac's; on Linux it is
+ // the command palette's, which the scan page's own hint says.
+ 'In Harness on $name, open Add Phone…, then scan the QR code. On a '
+ 'Mac, it’s in the Harness menu.',
style: tty.style(size: TtySize.row, color: tty.faint),
),
const SizedBox(height: 18),
diff --git a/mobile/lib/state/app_state.dart b/mobile/lib/state/app_state.dart
index 7de82cc00..8627c48e5 100644
--- a/mobile/lib/state/app_state.dart
+++ b/mobile/lib/state/app_state.dart
@@ -1475,7 +1475,7 @@ class AppNotifier extends ChangeNotifier {
// last thing started, behind several exclusive locks on one state file. The
// request now overlaps that disk work instead of queueing behind it, which
// takes a whole HTTP round-trip off the stretch the phone spends saying
- // "Connecting to your machine…".
+ // "Connecting to your computer…".
//
// ⚠️ The pool is built BEFORE the fetch is started, not after the restore
// below. A returning list dials each machine through `_conn`, which reads
@@ -2008,7 +2008,7 @@ class AppNotifier extends ChangeNotifier {
/// ⚠️ **"The first fetch", and not "a fetch over an empty list".** An account with no computer
/// yet has an empty list after every fetch, so every refresh used to raise [machinesLoading] —
/// and the phone's "Waiting for your computer…" page (`phone/welcome/connect_computer.dart`),
- /// which refreshes every 5 seconds, was swapped for "Looking for your machines…" by the home
+ /// which refreshes every 5 seconds, was swapped for "Looking for your computers…" by the home
/// screen each time and built again from scratch: a flash every 5 seconds, a scan's result
/// dropped with the page that started it. Keyed to the sign-in, so the next one starts over.
int? _machinesFetchedFor;
diff --git a/mobile/lib/viewer/direct_link.dart b/mobile/lib/viewer/direct_link.dart
index 755d827dd..aaa722cf0 100644
--- a/mobile/lib/viewer/direct_link.dart
+++ b/mobile/lib/viewer/direct_link.dart
@@ -96,7 +96,7 @@ class DirectLink implements PeerLinkClient {
error: switch (code) {
'CODE_MISMATCH' =>
'That code didn’t match. Scan the new one on $name.',
- 'TIMEOUT' => 'Keep “Add phone” open on $name, then scan again.',
+ 'TIMEOUT' => 'Keep “Add Phone” open on $name, then scan again.',
'PAIRING_BUSY' =>
'$name is pairing with something else. Try again.',
_ => 'Couldn’t connect to $name ($code).',
diff --git a/mobile/lib/viewer/viewer_key_store.dart b/mobile/lib/viewer/viewer_key_store.dart
index 604a1879a..5a5f506b8 100644
--- a/mobile/lib/viewer/viewer_key_store.dart
+++ b/mobile/lib/viewer/viewer_key_store.dart
@@ -68,7 +68,7 @@ class ViewerKeyStore {
/// for the peer before it opens a socket (`viewerRelayCodecs`). Uncached, a
/// phone waking to four machines that each redial takes four exclusive locks
/// on `state.json` and four full parses of it — in series, because the store
- /// queues them — while the screen says "Connecting to your machine…".
+ /// queues them — while the screen says "Connecting to your computer…".
///
/// Every write goes through [_write], which replaces this, so the cache cannot
/// outlive a link or an unlink. It is per-instance and the app builds one
diff --git a/mobile/lib/ws/ws_conn.dart b/mobile/lib/ws/ws_conn.dart
index b87d1546d..95a4753e5 100644
--- a/mobile/lib/ws/ws_conn.dart
+++ b/mobile/lib/ws/ws_conn.dart
@@ -244,7 +244,7 @@ class WsConn {
// (and may go to the network to refresh), while the codec comes off disk
// and mints an ephemeral key — neither has ever needed the other's result.
// In series they were two waits stacked in front of the dial, on the
- // stretch the phone shows as "Connecting to your machine…", and every
+ // stretch the phone shows as "Connecting to your computer…", and every
// reconnect paid it again.
final codecs = relayCodecs;
final pendingToken = StartupTrace.time(
@@ -1183,7 +1183,7 @@ class WsConn {
/// sending `machine_select`, and the second never sent one either because
/// `connect()`'s own `_connecting` guard had turned it away. The socket was
/// open, the relay was waiting to be told which machine, and neither side ever
- /// spoke: the launch hung on "Connecting to your machine…" indefinitely.
+ /// spoke: the launch hung on "Connecting to your computer…" indefinitely.
///
/// Reachable on every launch, not just on a real resume: the phone's shell
/// calls `handleAppResumed` as it mounts, which is a few hundred milliseconds