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.

feat(sharing): a simpler sharing pane — folders chosen, not typed, and no "guests" in what people read

bitcoinbuilder444ed6a22788
diff --git a/cli/src/core/agents/guestCreate.ts b/cli/src/core/agents/guestCreate.ts
index 1f425c4ce..01a686964 100644
--- a/cli/src/core/agents/guestCreate.ts
+++ b/cli/src/core/agents/guestCreate.ts
@@ -34,9 +34,9 @@ export interface GuestCreateDeps {
/** What a guest's New Harness may not ask for, each with why. */
const NOT_FOR_GUESTS: ReadonlyArray<readonly [string, string]> = [
- ['dsh', 'A guest starts Claude Code or Codex; harnesses from the Store are not available to guests.'],
- ['resumeSessionId', 'A guest starts a new conversation.'],
- ['agent', 'A guest starts the engine itself, not a named agent.'],
+ ['dsh', 'On a computer shared with you, you can start Claude Code or Codex, not harnesses from the Store.'],
+ ['resumeSessionId', 'On a computer shared with you, start a new conversation.'],
+ ['agent', 'On a computer shared with you, start Claude Code or Codex itself, not a named agent.'],
]
export function createGuestCreate(deps: GuestCreateDeps) {
diff --git a/cli/src/core/agents/launches.spec.ts b/cli/src/core/agents/launches.spec.ts
index 7b97d7b1f..effd7e07c 100644
--- a/cli/src/core/agents/launches.spec.ts
+++ b/cli/src/core/agents/launches.spec.ts
@@ -1061,10 +1061,10 @@ describe('agent_create, from a guest', () => {
})
it('records a refusal as the outcome, with its words', async () => {
- const guestCreate = vi.fn(async () => ({ ok: false as const, error: 'GUEST_UNSUPPORTED', detail: 'A guest starts a new conversation.' }))
+ const guestCreate = vi.fn(async () => ({ ok: false as const, error: 'GUEST_UNSUPPORTED', detail: 'On a computer shared with you, start a new conversation.' }))
const run = setup({ guestCreate: () => guestCreate })
await guestAsk(run, { creationId: CREATION, engine: 'claude' })
- await vi.waitFor(() => expect(run.replies.at(-1)).toEqual({ creationId: CREATION, state: 'failed', failure: { code: 'GUEST_UNSUPPORTED', detail: 'A guest starts a new conversation.' } }))
+ await vi.waitFor(() => expect(run.replies.at(-1)).toEqual({ creationId: CREATION, state: 'failed', failure: { code: 'GUEST_UNSUPPORTED', detail: 'On a computer shared with you, start a new conversation.' } }))
guestCreate.mockResolvedValueOnce({ ok: false, error: 'TMUX_UNAVAILABLE' } as never)
await guestAsk(run, { creationId: 'creation-fedcba9876543210', engine: 'claude' })
await vi.waitFor(() => expect(run.replies.at(-1)).toEqual({ creationId: 'creation-fedcba9876543210', state: 'failed', failure: { code: 'TMUX_UNAVAILABLE' } }))
diff --git a/cli/src/core/api.spec.ts b/cli/src/core/api.spec.ts
index ba5ac66ba..0ccbef058 100644
--- a/cli/src/core/api.spec.ts
+++ b/cli/src/core/api.spec.ts
@@ -425,7 +425,7 @@ describe('the core API services stand on', () => {
it('answers a guest\'s New Harness while shared machines is off: guest access unavailable, in words, and nothing to stop', async () => {
expect(await SHARED_MACHINES_OFF.guestLaunch({ email: '[email protected]', engine: 'claude', bypassPermission: true }))
- .toEqual({ ok: false, error: 'GUEST_UNAVAILABLE', detail: expect.stringMatching(/Guest access/) })
+ .toEqual({ ok: false, error: 'GUEST_UNAVAILABLE', detail: expect.stringMatching(/Sharing isn't running/) })
expect(SHARED_MACHINES_OFF.stop()).toBeUndefined()
expect(SHARED_MACHINES_FALLBACKS.stop).toBeUndefined()
expect(LONG_ANSWERS.sharedMachines).toEqual({ guestLaunch: 2 * 60_000, shared_machines: 11 * 60_000 })
diff --git a/cli/src/core/api.ts b/cli/src/core/api.ts
index 43b49f895..5e7e755cd 100644
--- a/cli/src/core/api.ts
+++ b/cli/src/core/api.ts
@@ -679,7 +679,7 @@ export interface SharedMachinesCorePort {
/** What a guest's New Harness is told while shared machines is off or failing. */
export const GUEST_LAUNCH_UNAVAILABLE: GuestLaunch = {
- ok: false, error: 'GUEST_UNAVAILABLE', detail: 'Guest access is not running on this computer right now. Try again in a moment.',
+ ok: false, error: 'GUEST_UNAVAILABLE', detail: 'Sharing isn\'t running on this computer right now. Try again in a moment.',
}
export const SHARED_MACHINES_FALLBACKS: PortFallbacks<SharedMachinesCorePort> = { guestLaunch: later(GUEST_LAUNCH_UNAVAILABLE), stop: undefined }
/** What the core calls while `ports.sharedMachines` is null. */
diff --git a/cli/src/core/guestPolicy.spec.ts b/cli/src/core/guestPolicy.spec.ts
index af621bd0c..b7d56a0d0 100644
--- a/cli/src/core/guestPolicy.spec.ts
+++ b/cli/src/core/guestPolicy.spec.ts
@@ -63,7 +63,7 @@ describe('what a guest may ask', () => {
})
it('says why in words', () => {
- expect(GUEST_REFUSALS.GUEST_NOT_ALLOWED).toMatch(/guest/)
+ expect(GUEST_REFUSALS.GUEST_NOT_ALLOWED).toMatch(/shared with you/)
expect(GUEST_REFUSALS.NOT_YOUR_HARNESS).toMatch(/not yours/)
})
})
diff --git a/cli/src/core/guestPolicy.ts b/cli/src/core/guestPolicy.ts
index c05e91ba4..cd182e397 100644
--- a/cli/src/core/guestPolicy.ts
+++ b/cli/src/core/guestPolicy.ts
@@ -81,11 +81,11 @@ export function eventAgentId(frame: { agentId?: unknown; payload?: unknown }): s
* keys, in a folder the owner may only read. A guest starts a new harness instead.
*/
export const GUEST_HARNESS_REFUSAL = {
- ok: false, error: 'GUEST_HARNESS', detail: 'A guest\'s harness is not restarted, resumed, moved or forked. Start a new one.',
+ ok: false, error: 'GUEST_HARNESS', detail: 'On a computer shared with you, harnesses can\'t be restarted, resumed, moved or forked. Start a new one.',
} as const
/** What a guest is told when it is refused. */
export const GUEST_REFUSALS: Record<'GUEST_NOT_ALLOWED' | 'NOT_YOUR_HARNESS', string> = {
- GUEST_NOT_ALLOWED: 'A guest on this computer cannot do that.',
+ GUEST_NOT_ALLOWED: 'That isn\'t available on a computer shared with you.',
NOT_YOUR_HARNESS: 'That harness is not yours.',
}
diff --git a/cli/src/lib/guestHelperInstall.spec.ts b/cli/src/lib/guestHelperInstall.spec.ts
index f9582a136..2b3053930 100644
--- a/cli/src/lib/guestHelperInstall.spec.ts
+++ b/cli/src/lib/guestHelperInstall.spec.ts
@@ -128,7 +128,7 @@ describe('installing the helper', () => {
.toEqual({ ok: false, code: 'FAILED', message: '/usr/local is not owned by root (6)' })
const silent = vi.fn<GuestRunner>(async () => ({ code: 1, stdout: '', stderr: '' }))
expect(await installGuestHelper({ owner: 'ann', runner: silent, platform: 'darwin', nodeRuntimeDir: null, hookScript: null }))
- .toEqual({ ok: false, code: 'FAILED', message: 'The guest helper could not be installed.' })
+ .toEqual({ ok: false, code: 'FAILED', message: 'Sharing could not be set up on this computer.' })
})
it('uses pkexec on a Linux desktop and sudo in a terminal', async () => {
diff --git a/cli/src/lib/guestHelperInstall.ts b/cli/src/lib/guestHelperInstall.ts
index 8e7eddafe..5d3cb7e4a 100644
--- a/cli/src/lib/guestHelperInstall.ts
+++ b/cli/src/lib/guestHelperInstall.ts
@@ -128,7 +128,7 @@ export interface GuestHelperInstallOptions {
export async function installGuestHelper(options: GuestHelperInstallOptions = {}): Promise<GuestHelperInstallResult> {
const platform = options.platform ?? process.platform
if (platform !== 'darwin' && platform !== 'linux') {
- return { ok: false, code: 'UNSUPPORTED', message: 'Sharing a computer with guests needs macOS or Linux.' }
+ return { ok: false, code: 'UNSUPPORTED', message: 'Sharing this computer needs macOS or Linux.' }
}
const runner = options.runner ?? runGuestCommand
const owner = options.owner ?? userInfo().username
@@ -170,7 +170,7 @@ export async function installGuestHelper(options: GuestHelperInstallOptions = {}
}
if (result.code !== 0) {
const said = result.stderr.trim().split('\n').pop()?.replace(/^.*harness: /, '') ?? ''
- return { ok: false, code: 'FAILED', message: said || 'The guest helper could not be installed.' }
+ return { ok: false, code: 'FAILED', message: said || 'Sharing could not be set up on this computer.' }
}
return { ok: true }
} finally {
diff --git a/cli/src/lib/guestPaneCommand.spec.ts b/cli/src/lib/guestPaneCommand.spec.ts
index 654aec5f8..5db03b818 100644
--- a/cli/src/lib/guestPaneCommand.spec.ts
+++ b/cli/src/lib/guestPaneCommand.spec.ts
@@ -106,7 +106,7 @@ describe('the pane\'s first moments', () => {
it('says so and stops when the install fails', () => {
const { log, out, code } = run(false, false)
expect(code).toBe(1)
- expect(out).toContain('Could not install claude for this guest.')
+ expect(out).toContain('Could not install claude.')
expect(log.at(-1)).toBe('-n /helper install hg_0123456789ab claude')
})
})
diff --git a/cli/src/lib/guestPaneCommand.ts b/cli/src/lib/guestPaneCommand.ts
index 3d273adc6..489bb4615 100644
--- a/cli/src/lib/guestPaneCommand.ts
+++ b/cli/src/lib/guestPaneCommand.ts
@@ -29,7 +29,7 @@ const APPROVE_ALL: Record<GuestLaunchEngine, string> = {
export const GUEST_PANE_BOOTSTRAP = [
'helper=$1 user=$2 work=$3 engine=$4; shift 4',
'if ! sudo -n "$helper" run "$user" --cwd "$work" -- /bin/sh -c \'command -v "$0" >/dev/null\' "$engine" 2>/dev/null; then',
- ' sudo -n "$helper" install "$user" "$engine" || { printf \'\\nCould not install %s for this guest.\\n\' "$engine"; exit 1; }',
+ ' sudo -n "$helper" install "$user" "$engine" || { printf \'\\nCould not install %s.\\n\' "$engine"; exit 1; }',
'fi',
'exec "$@"',
].join('\n')
diff --git a/cli/src/services/guestLaunches.spec.ts b/cli/src/services/guestLaunches.spec.ts
index ad302911f..371f53cac 100644
--- a/cli/src/services/guestLaunches.spec.ts
+++ b/cli/src/services/guestLaunches.spec.ts
@@ -74,7 +74,7 @@ describe('a guest\'s harness, as shared machines builds it', () => {
})
it('asks the owner to turn guest access on, in words, until the helper is ready', async () => {
- for (const [state, words] of [['missing', /not turned guest access on/], ['outdated', /after an update/], ['not-authorized', /on again/]] as const) {
+ for (const [state, words] of [['missing', /finished turning on sharing/], ['outdated', /after an update/], ['not-authorized', /sharing back on\./]] as const) {
const { launches } = setup({ state })
expect(await launches.launch(input)).toEqual({ ok: false, error: 'GUEST_HELPER_REQUIRED', detail: expect.stringMatching(words) })
}
diff --git a/cli/src/services/guestLaunches.ts b/cli/src/services/guestLaunches.ts
index 0607dd5d9..d21cfd586 100644
--- a/cli/src/services/guestLaunches.ts
+++ b/cli/src/services/guestLaunches.ts
@@ -39,9 +39,9 @@ export interface GuestLaunches {
}
const HELPER_REQUIRED: Record<Exclude<GuestHelperState, 'ready'>, string> = {
- missing: 'The owner of this computer has not turned guest access on yet.',
- outdated: 'The owner of this computer has to turn guest access on again after an update.',
- 'not-authorized': 'The owner of this computer has to turn guest access on again.',
+ missing: 'The owner of this computer hasn\'t finished turning on sharing yet.',
+ outdated: 'The owner of this computer needs to turn sharing back on after an update.',
+ 'not-authorized': 'The owner of this computer needs to turn sharing back on.',
}
/** Whether [path] (resolved) is [folder] or inside it. */
@@ -78,7 +78,7 @@ export function createGuestLaunches(deps: GuestLaunchesDeps): GuestLaunches {
const guest = email.trim().toLowerCase()
if (!guest) return { ok: false, error: 'NOT_YOUR_HARNESS', detail: 'This computer does not know whom it is shared with here.' }
if (!GUEST_LAUNCH_ENGINES.includes(engine)) {
- return { ok: false, error: 'GUEST_ENGINE_UNSUPPORTED', detail: 'A guest can start Claude Code or Codex on this computer.' }
+ return { ok: false, error: 'GUEST_ENGINE_UNSUPPORTED', detail: 'You can start Claude Code or Codex on this computer.' }
}
const state = await deps.helperState()
if (state !== 'ready') return { ok: false, error: 'GUEST_HELPER_REQUIRED', detail: HELPER_REQUIRED[state] }
diff --git a/cli/src/services/sharedMachines.spec.ts b/cli/src/services/sharedMachines.spec.ts
index ab4c630ef..dd5cf3602 100644
--- a/cli/src/services/sharedMachines.spec.ts
+++ b/cli/src/services/sharedMachines.spec.ts
@@ -400,8 +400,8 @@ describe('shared machines', () => {
expect(ownerFolderProblem(join(home, 'missing'), home, guests, uid)).toMatch(/^No such folder on this computer/)
expect(ownerFolderProblem(join(home, 'notes.txt'), home, guests, uid)).toMatch(/^Not a folder/)
expect(ownerFolderProblem(home, home, guests, uid)).toMatch(/whole home folder/)
- expect(ownerFolderProblem(join(guests, 'hg_0123456789ab'), home, guests, uid)).toMatch(/guest's home/)
- expect(ownerFolderProblem(guests, home, guests, uid)).toMatch(/guest's home/)
+ expect(ownerFolderProblem(join(guests, 'hg_0123456789ab'), home, guests, uid)).toMatch(/belongs to someone you share with/)
+ expect(ownerFolderProblem(guests, home, guests, uid)).toMatch(/belongs to someone you share with/)
expect(ownerFolderProblem(join(home, 'code'), home, guests, uid + 1)).toMatch(/your own folders/)
// A platform with no uids checks the rest; the defaults are this account's.
expect(ownerFolderProblem(join(home, 'code'), home, guests, undefined)).toBeNull()
diff --git a/cli/src/services/sharedMachines.ts b/cli/src/services/sharedMachines.ts
index de2ba515b..04d0b1c86 100644
--- a/cli/src/services/sharedMachines.ts
+++ b/cli/src/services/sharedMachines.ts
@@ -106,7 +106,7 @@ export function ownerFolderProblem(path: string, home = homedir(), guests = gues
try { info = statSync(path) } catch { return `No such folder on this computer: ${path}` }
if (!info.isDirectory()) return `Not a folder: ${path}`
if (resolve(path) === resolve(home)) return 'Your whole home folder cannot be shared. Choose a folder in it.'
- if (path === guests || path.startsWith(`${guests}/`)) return `A guest's home cannot be shared: ${path}`
+ if (path === guests || path.startsWith(`${guests}/`)) return `This folder belongs to someone you share with and can't be shared: ${path}`
if (uid !== undefined && info.uid !== uid) return `Only your own folders can be shared: ${path}`
return null
}
diff --git a/desktop/lib/state/app_state.dart b/desktop/lib/state/app_state.dart
index feab2f036..7c0b415c1 100644
--- a/desktop/lib/state/app_state.dart
+++ b/desktop/lib/state/app_state.dart
@@ -13338,7 +13338,7 @@ class AppNotifier extends ChangeNotifier {
'Update the harness CLI on $machine to open this kind of pane.',
// A guest's harness: its owner turns guest access on, and only Claude Code or Codex start.
'GUEST_NOT_ALLOWED' =>
- 'As a guest on $machine you can start Claude Code or Codex.',
+ 'You can only start Claude Code or Codex on $machine.',
'GUEST_UNSUPPORTED' ||
'GUEST_HELPER_REQUIRED' ||
'GUEST_UNAVAILABLE' ||
@@ -14497,7 +14497,7 @@ class AppNotifier extends ChangeNotifier {
if (stateOf(machineId)?.machine.isSharedMachine == true) {
return Future.value(
const RestartAgentResult(
- error: 'A guest’s harness is not restarted, resumed or forked. Start a new one.',
+ error: 'On a computer shared with you, harnesses can’t be restarted, resumed or forked. Start a new one.',
retryable: false,
),
);
@@ -14575,7 +14575,7 @@ class AppNotifier extends ChangeNotifier {
// Relaunched, a guest's harness would run the owner's way, as the owner: the daemon refuses it.
if (machine.machine.isSharedMachine) {
return const RestartAgentResult(
- error: 'A guest’s harness is not restarted, resumed or forked. Start a new one.',
+ error: 'On a computer shared with you, harnesses can’t be restarted, resumed or forked. Start a new one.',
retryable: false,
);
}
@@ -14974,7 +14974,7 @@ class AppNotifier extends ChangeNotifier {
}
if (stateOf(machineId)?.machine.isSharedMachine == true) {
return Future.value(
- 'A guest’s harness keeps the agent it started with. Start a new one.',
+ 'On a computer shared with you, a harness keeps the agent it started with. Start a new one.',
);
}
if (!agentSwitchEngines(machineId, source).contains(engine)) {
@@ -15369,7 +15369,7 @@ class AppNotifier extends ChangeNotifier {
}
if (machine.machine.isSharedMachine) {
return const ForkAgentResult(
- error: 'A guest’s harness is not restarted, resumed or forked. Start a new one.',
+ error: 'On a computer shared with you, harnesses can’t be restarted, resumed or forked. Start a new one.',
);
}
if (!attempt.awaitingConfirmation) {
diff --git a/desktop/lib/state/retarget_refusal.dart b/desktop/lib/state/retarget_refusal.dart
index 4b5912d5d..b970b210f 100644
--- a/desktop/lib/state/retarget_refusal.dart
+++ b/desktop/lib/state/retarget_refusal.dart
@@ -56,7 +56,7 @@ String retargetRefusalMessage(
'UNSUPPORTED' => 'Update the harness CLI on this machine to change models.',
// A guest's harness runs on its owner's plans and is never relaunched
// (docs/plans/2026-10-19-guest-machine-sharing-plan.md).
- 'GUEST_NOT_ALLOWED' || 'GUEST_HARNESS' => 'A guest’s harness keeps the model it started with. Start a new one to use another.',
+ 'GUEST_NOT_ALLOWED' || 'GUEST_HARNESS' => 'On a computer shared with you, a harness keeps the model it started with. Start a new one to use another.',
_ => "Couldn't change this harness's model.",
};
}
diff --git a/desktop/lib/state/swarm_navigation.dart b/desktop/lib/state/swarm_navigation.dart
index d7510548c..463304d17 100644
--- a/desktop/lib/state/swarm_navigation.dart
+++ b/desktop/lib/state/swarm_navigation.dart
@@ -602,7 +602,7 @@ class SwarmSearchCatalog {
detail: [
'Machine',
if (machine.machine.machineShare case final share?)
- 'Guest · shared by ${share.owner}',
+ 'Shared by ${share.owner}',
_countLabel(members.length, 'harness'),
if (machine.needsLink)
'Link required'
@@ -981,7 +981,12 @@ Future<bool> _activateSwarmSearchSelection(
final openedTab = target;
await Future.wait([
for (final row in members)
- _attachSearchHarness(app, row.machineId!, row.agentId!, swarmId: openedTab.id),
+ _attachSearchHarness(
+ app,
+ row.machineId!,
+ row.agentId!,
+ swarmId: openedTab.id,
+ ),
]);
return app.swarms.contains(openedTab) &&
members.every(
@@ -1115,7 +1120,12 @@ Future<bool> _activateSwarmSearchSelection(
}
await Future.wait([
for (final row in members)
- _attachSearchHarness(app, row.machineId!, row.agentId!, swarmId: openedTab.id),
+ _attachSearchHarness(
+ app,
+ row.machineId!,
+ row.agentId!,
+ swarmId: openedTab.id,
+ ),
]);
return members.every(
(row) => openedTab.panes.any(
@@ -1742,9 +1752,7 @@ Future<bool> activateSwarmDestination(
return false;
}
await _resumeStoppedDestination(app, destination);
- var target = app.swarms
- .where((s) => s.id == destinationSwarmId)
- .firstOrNull;
+ var target = app.swarms.where((s) => s.id == destinationSwarmId).firstOrNull;
if (target == null) return false;
if (target.isSuperTab && target.superTabId != null) {
app.newSwarm();
diff --git a/desktop/lib/widgets/machine_sharing_form.dart b/desktop/lib/widgets/machine_sharing_form.dart
index c92d33fd6..8c0d745b5 100644
--- a/desktop/lib/widgets/machine_sharing_form.dart
+++ b/desktop/lib/widgets/machine_sharing_form.dart
@@ -1,12 +1,15 @@
import 'dart:async';
+import 'package:file_selector/file_selector.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
+import '../core/desktop_window.dart';
import '../core/guest_folders.dart';
import '../shared/theme/app_icons.dart';
import '../shared/theme/app_theme.dart' as grid;
import '../shared/widgets/app_icon_button.dart';
+import '../shared/widgets/app_select_field.dart';
import '../shortcuts/app_keymap.dart';
import '../shortcuts/keymap.dart';
import '../state/app_state.dart';
@@ -15,6 +18,7 @@ import '../terminal/terminal_theme.dart';
import '../terminal/terminal_theme_store.dart';
import 'box_chrome.dart' show ReadlineKeys;
import 'desktop_chrome.dart';
+import 'remote_folder_picker.dart';
import 'terminal_text_action.dart';
/// The most addresses one machine is shared with (CLI services/sharedMachines.ts `SHARE_EMAILS_MAX`).
@@ -48,6 +52,8 @@ class MachineSharingForm extends StatefulWidget {
required this.onClose,
required this.onFocusChanged,
this.onSwitchPane,
+ this.onModalChanged,
+ this.chooseFolder,
});
final AppNotifier app;
final String machineId;
@@ -55,6 +61,15 @@ class MachineSharingForm extends StatefulWidget {
final ValueChanged<bool> onFocusChanged;
final VoidCallback? onSwitchPane;
+ /// Told when a dialog of the form's opens over the workspace (true) and closes (false): a picker
+ /// that hosts the form steps aside meanwhile instead of closing, which would drop the folder picked.
+ final ValueChanged<bool>? onModalChanged;
+
+ /// Picks a folder on the machine being shared, or null when cancelled. Defaults to the macOS
+ /// folder panel on this computer and the folder browser on any other (a panel there would browse
+ /// this Mac and hand back a path that is not on that machine); tests pass their own.
+ final Future<String?> Function(BuildContext context)? chooseFolder;
+
@override
State<MachineSharingForm> createState() => MachineSharingFormState();
}
@@ -72,7 +87,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
String? _unavailable;
/// What is wrong with what was typed, said under the field it was typed in ([_fieldIsError]: in
- /// error ink; otherwise a quiet note, "Already shared with …").
+ /// error ink; otherwise a quiet note, "… already has access").
String? _fieldError;
bool _fieldIsError = true;
@@ -99,6 +114,9 @@ class MachineSharingFormState extends State<MachineSharingForm> {
/// What is wrong with the folder typed, said under its field.
String? _folderError;
+ /// A folder picker is open: a second press waits for it.
+ bool _choosing = false;
+
AppNotifier get app => widget.app;
/// Whether it is shared with anyone now.
@@ -106,10 +124,16 @@ class MachineSharingFormState extends State<MachineSharingForm> {
/// What a guest gets, and, until it is on, what sharing will ask of the owner.
String get _guestNote => _approving
- ? 'Approve the prompt on $_name: it lets each guest run as their own account there.'
- : 'Guests get their own space on $_name and can use your Claude and ChatGPT plans. '
- 'They cannot see your files or harnesses.'
- '${_guestAccess == null || _guestAccess == 'ready' ? '' : ' Sharing asks for an admin password on $_name once.'}';
+ ? 'Enter your password on $_name to finish setting up.'
+ : 'People you invite get their own private space here and use your Claude and '
+ 'ChatGPT plans. They can’t see your files or harnesses.'
+ // Shared already, the notice under this says it (_guestsOffNote).
+ '${_guestAccess == null || _guestAccess == 'ready' || _sharing ? '' : ' You’ll enter your password once to set this up.'}';
+
+ /// Why guests cannot use it yet, beside the button that fixes it.
+ String get _guestsOffNote => _guestAccess == 'outdated'
+ ? 'People you added can’t use it since the update.'
+ : 'People you added can’t use it yet.';
String get _name =>
app.stateOf(widget.machineId)?.machine.displayName ?? 'this machine';
bool get _composing =>
@@ -158,7 +182,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
} catch (error) {
answer = {
'error': 'UNAVAILABLE',
- 'message': 'Could not reach $_name. Check that it is online.',
+ 'message': 'Can’t reach $_name. Make sure it’s on and online.',
};
}
if (!mounted) return;
@@ -168,8 +192,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
if (error != null) {
_unavailable = error == 'UNSUPPORTED'
? 'Update Harness on $_name to share it.'
- : answer['message'] as String? ??
- 'Could not read its sharing ($error).';
+ : answer['message'] as String? ?? 'Couldn’t load sharing ($error).';
} else {
_show(answer);
}
@@ -248,7 +271,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
} catch (error) {
answer = {
'error': 'UNAVAILABLE',
- 'message': 'Could not reach $_name. Nothing changed.',
+ 'message': 'Can’t reach $_name. Nothing changed.',
};
}
if (!mounted) return false;
@@ -259,7 +282,8 @@ class MachineSharingFormState extends State<MachineSharingForm> {
_show(answer);
} else {
_status =
- answer['message'] as String? ?? 'Could not share it ($error).';
+ answer['message'] as String? ??
+ 'Couldn’t save the change ($error).';
}
});
if (error != null) return false;
@@ -285,7 +309,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
} catch (error) {
enabled = {
'error': 'UNAVAILABLE',
- 'message': 'Could not reach $_name. Nothing changed.',
+ 'message': 'Can’t reach $_name. Nothing changed.',
};
}
if (!mounted) return false;
@@ -296,7 +320,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
_busy = false;
_status =
enabled['message'] as String? ??
- 'Guest access was not turned on ($refused).';
+ 'Couldn’t turn on sharing ($refused).';
} else {
_guestAccess = enabled['guestAccess'] as String? ?? 'ready';
}
@@ -339,7 +363,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
.where((email) => !_emailPattern.hasMatch(email))
.firstOrNull;
if (bad != null) {
- _fieldSays('“$bad” is not an email address.');
+ _fieldSays('“$bad” isn’t a valid email address.');
_input.requestFocus();
return;
}
@@ -348,16 +372,14 @@ class MachineSharingFormState extends State<MachineSharingForm> {
_value.clear();
_fieldSays(
typed.length == 1
- ? 'Already shared with ${typed.single}.'
- : 'Already shared with them.',
+ ? '${typed.single} already has access.'
+ : 'They already have access.',
error: false,
);
return;
}
if (_emails.length + fresh.length > machineShareEmailsMax) {
- _fieldSays(
- 'A machine can be shared with up to $machineShareEmailsMax people.',
- );
+ _fieldSays('You can invite up to $machineShareEmailsMax people.');
return;
}
final added = await _apply([..._emails, ...fresh], _sameDomain);
@@ -389,7 +411,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
} catch (error) {
answer = {
'error': 'UNAVAILABLE',
- 'message': 'Could not reach $_name. Nothing changed.',
+ 'message': 'Can’t reach $_name. Nothing changed.',
};
}
if (!mounted) return false;
@@ -401,7 +423,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
} else {
_status =
answer['message'] as String? ??
- 'Could not share the folder ($error).';
+ 'Couldn’t share the folder ($error).';
}
});
if (error != null) return false;
@@ -409,12 +431,61 @@ class MachineSharingFormState extends State<MachineSharingForm> {
return true;
}
- /// The folder typed, shared read only: a guest's harness may read it, and the switch lets it edit.
- Future<void> _addFolder() async {
- if (_busy || _loading) return;
+ /// A folder picked on that machine, shared as one typed would be.
+ Future<void> _chooseFolder() async {
+ if (_busy || _loading || _choosing) return;
+ setState(() => _choosing = true);
+ String? picked;
+ try {
+ picked = await (widget.chooseFolder ?? _pickFolder)(context);
+ } finally {
+ if (mounted) setState(() => _choosing = false);
+ }
+ if (!mounted) return;
+ if (picked == null || picked.trim().isEmpty) {
+ _focusFolders();
+ return;
+ }
+ await _addFolder(picked.trim());
+ }
+
+ Future<String?> _pickFolder(BuildContext context) {
final typed = _folderValue.text.trim();
+ final start = typed.startsWith('/') ? typed : null;
+ return app.stateOf(widget.machineId)?.isLocalMachine == true
+ ? whileNativePicker(
+ () => getDirectoryPath(
+ initialDirectory: start,
+ confirmButtonText: 'Share',
+ ),
+ )
+ : _modal(
+ () => showRemoteFolderPicker(
+ context,
+ notifier: app,
+ machineId: widget.machineId,
+ initialPath: start,
+ desktop: true,
+ ),
+ );
+ }
+
+ Future<T> _modal<T>(Future<T> Function() dialog) async {
+ widget.onModalChanged?.call(true);
+ try {
+ return await dialog();
+ } finally {
+ widget.onModalChanged?.call(false);
+ }
+ }
+
+ /// The folder typed (or [chosen]), shared read only: a guest's harness may read it, and the
+ /// switch lets it edit. Nothing typed opens the picker.
+ Future<void> _addFolder([String? chosen]) async {
+ if (_busy || _loading) return;
+ final typed = chosen ?? _folderValue.text.trim();
if (typed.isEmpty) {
- _folderInput.requestFocus();
+ await _chooseFolder();
return;
}
final path = typed.length > 1 && typed.endsWith('/')
@@ -425,21 +496,28 @@ class MachineSharingFormState extends State<MachineSharingForm> {
problem =
'Enter the folder’s full path on $_name, like /Users/you/project.';
} else if (_folders.any((folder) => folder.path == path)) {
- problem = 'Guests can already use $path.';
+ problem = '${_folderName(path)} is already shared.';
} else if (_folders.length >= machineSharedFoldersMax) {
- problem = 'Guests can use up to $machineSharedFoldersMax folders.';
+ problem = 'You can share up to $machineSharedFoldersMax folders.';
}
if (problem != null) {
setState(() => _folderError = problem);
- _folderInput.requestFocus();
+ _focusFolders();
return;
}
final added = await _applyFolders([
..._folders,
GuestFolder(path: path, write: false),
]);
- if (added) _folderValue.clear();
- if (mounted) _folderInput.requestFocus();
+ if (added && chosen == null) _folderValue.clear();
+ if (mounted) _focusFolders();
+ }
+
+ /// Back to where folders are added: Add Folder on the desktop, the path field in the terminal look.
+ void _focusFolders() {
+ if (!mounted) return;
+ (DesktopChrome.of(context) ? _node('folder-choose') : _folderInput)
+ .requestFocus();
}
Future<void> _toggleFolderWrite(String path) => _applyFolders([
@@ -462,6 +540,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
/// The editor's stops, in reading order: Back, the domain switch, (the field,) Share, each person's
/// remove (or Back and Retry when the sharing could not be read).
List<({String id, VoidCallback? run})> get _stops {
+ final desktop = DesktopChrome.of(context);
if (_loading || _unavailable != null) {
return [
(id: 'back', run: _done),
@@ -474,23 +553,25 @@ class MachineSharingFormState extends State<MachineSharingForm> {
(id: 'guests-on', run: _busy ? null : () => unawaited(_turnGuestsOn())),
if (_domain != null)
(id: 'domain', run: _busy ? null : () => unawaited(_toggleDomain())),
- (
- id: 'add',
- run: _busy || _value.text.trim().isEmpty
- ? null
- : () => unawaited(_add()),
- ),
+ // Invite and Add Folder are buttons on the desktop only; the terminal look takes Enter in its
+ // fields instead, and a stop with nothing drawn would hold the focus nowhere.
+ if (desktop)
+ (
+ id: 'add',
+ run: _busy || _value.text.trim().isEmpty
+ ? null
+ : () => unawaited(_add()),
+ ),
for (final person in _people)
(
id: 'remove:${person.email}',
run: _busy ? null : () => unawaited(_remove(person.email)),
),
- (
- id: 'folder-add',
- run: _busy || _folderValue.text.trim().isEmpty
- ? null
- : () => unawaited(_addFolder()),
- ),
+ if (desktop)
+ (
+ id: 'folder-choose',
+ run: _busy || _choosing ? null : () => unawaited(_chooseFolder()),
+ ),
for (final folder in _folders) ...[
(
id: 'folder-write:${folder.path}',
@@ -510,6 +591,8 @@ class MachineSharingFormState extends State<MachineSharingForm> {
List<FocusNode> get _nodes {
final stops = _stops.where((stop) => stop.run != null).toList();
final field = !_loading && _unavailable == null && !_busy;
+ // The desktop adds folders with Add Folder; only the terminal look has a path field.
+ final pathField = field && !DesktopChrome.of(context);
const beforeField = {'back', 'guests-on', 'domain'};
bool folders(String id) => id.startsWith('folder-');
return [
@@ -518,7 +601,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
if (field) _input,
for (final stop in stops)
if (!beforeField.contains(stop.id) && !folders(stop.id)) _node(stop.id),
- if (field) _folderInput,
+ if (pathField) _folderInput,
for (final stop in stops)
if (folders(stop.id)) _node(stop.id),
];
@@ -637,8 +720,8 @@ class MachineSharingFormState extends State<MachineSharingForm> {
);
}
- /// The person's mark: the first letter of their address, in a neutral disc.
- Widget _avatar(String email) => Container(
+ /// A row's mark in a neutral disc: a person's first letter, or a symbol for the domain and folders.
+ Widget _disc({String? letter, IconData? icon}) => Container(
width: 28,
height: 28,
alignment: Alignment.center,
@@ -647,10 +730,14 @@ class MachineSharingFormState extends State<MachineSharingForm> {
shape: BoxShape.circle,
border: Border.all(color: DesktopChrome.rim),
),
- child: Text(
- email.isEmpty ? '?' : email.characters.first.toUpperCase(),
- style: DesktopChrome.control(medium: true),
- ),
+ child: icon != null
+ ? Icon(icon, size: 14, color: DesktopChrome.muted)
+ : Text(
+ letter == null || letter.isEmpty
+ ? '?'
+ : letter.characters.first.toUpperCase(),
+ style: DesktopChrome.control(medium: true),
+ ),
);
Widget _spinner() => SizedBox(
@@ -706,20 +793,91 @@ class MachineSharingFormState extends State<MachineSharingForm> {
);
// What sharing gives, said once and plainly: guests get a space of their own, never the owner's.
- final access = Row(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Padding(
- padding: const EdgeInsets.only(top: 2),
- child: Icon(
- AppIcons.shield,
+ final access = Text(_guestNote, style: muted13);
+
+ // Shared, but guests cannot start anything until guest access is on: said once, beside the fix.
+ final guestsOff = Container(
+ key: const ValueKey('machine-sharing:guests-off'),
+ decoration: inset,
+ padding: const EdgeInsets.fromLTRB(12, 8, 8, 8),
+ child: Row(
+ children: [
+ Icon(
+ AppIcons.circleAlert,
size: AppIcons.inlineSize,
color: DesktopChrome.muted,
),
+ const SizedBox(width: 10),
+ Expanded(
+ child: Text(_guestsOffNote, style: DesktopChrome.text(size: 13)),
+ ),
+ const SizedBox(width: DesktopChrome.controlGap),
+ FilledButton(
+ key: const ValueKey('machine-sharing:guests-on'),
+ focusNode: _node('guests-on'),
+ onPressed: _busy ? null : () => unawaited(_turnGuestsOn()),
+ child: const Text('Turn On Sharing'),
+ ),
+ ],
+ ),
+ );
+
+ Widget section(String title, {String? detail}) => Padding(
+ padding: const EdgeInsets.only(bottom: DesktopChrome.controlGap),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(title, style: DesktopChrome.control(medium: true)),
+ if (detail != null) ...[
+ const SizedBox(height: 4),
+ Text(detail, style: muted13),
+ ],
+ ],
+ ),
+ );
+
+ // One list anatomy for people, the domain and folders: a mark, the name, a line of context,
+ // then the controls at the right edge.
+ Widget listRow({
+ required Key key,
+ required Widget mark,
+ required String title,
+ required Widget subtitle,
+ required List<Widget> trailing,
+ String? tooltip,
+ }) {
+ Widget name = Text(
+ title,
+ style: DesktopChrome.control(medium: true),
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ );
+ if (tooltip != null) name = Tooltip(message: tooltip, child: name);
+ return Padding(
+ key: key,
+ padding: const EdgeInsets.symmetric(vertical: 6),
+ child: Row(
+ children: [
+ mark,
+ const SizedBox(width: 12),
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [name, const SizedBox(height: 2), subtitle],
+ ),
+ ),
+ const SizedBox(width: 8),
+ ...trailing,
+ ],
),
- const SizedBox(width: 8),
- Expanded(child: Text(_guestNote, style: muted13)),
- ],
+ );
+ }
+
+ Widget quiet(String text) => Text(
+ text,
+ style: DesktopChrome.metadata(),
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
);
Widget domainRow(String domain) => MergeSemantics(
@@ -730,44 +888,23 @@ class MachineSharingFormState extends State<MachineSharingForm> {
borderRadius: BorderRadius.circular(DesktopChrome.rowRadius),
canRequestFocus: false,
onTap: _busy ? null : () => unawaited(_toggleDomain()),
- child: Ink(
- decoration: inset,
- padding: const EdgeInsets.fromLTRB(12, 10, 8, 10),
- child: Row(
- children: [
- Icon(
- AppIcons.globe,
- size: AppIcons.inlineSize,
- color: DesktopChrome.muted,
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- 'Everyone at $domain',
- style: DesktopChrome.control(medium: true),
- ),
- const SizedBox(height: 2),
- Text(
- _sameDomain
- ? 'Anyone with an @$domain address can use it.'
- : 'Let anyone with an @$domain address use it.',
- style: DesktopChrome.metadata(),
- ),
- ],
- ),
- ),
- const SizedBox(width: 12),
- Switch(
- key: const ValueKey('machine-sharing:domain'),
- focusNode: _node('domain'),
- value: _sameDomain,
- onChanged: _busy ? null : (_) => unawaited(_toggleDomain()),
- ),
- ],
+ child: listRow(
+ key: const ValueKey('machine-sharing-domain'),
+ mark: _disc(icon: AppIcons.globe),
+ title: 'Everyone at $domain',
+ subtitle: quiet(
+ _sameDomain
+ ? 'Anyone with an @$domain email can use it.'
+ : 'Let anyone with an @$domain email use it.',
),
+ trailing: [
+ Switch(
+ key: const ValueKey('machine-sharing:domain'),
+ focusNode: _node('domain'),
+ value: _sameDomain,
+ onChanged: _busy ? null : (_) => unawaited(_toggleDomain()),
+ ),
+ ],
),
),
),
@@ -789,7 +926,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
style: DesktopChrome.text(size: 13),
cursorColor: DesktopChrome.accent,
decoration: InputDecoration(
- hintText: 'Add people by email',
+ hintText: 'Email address',
hintStyle: muted13,
prefixIcon: Icon(
AppIcons.user,
@@ -832,182 +969,113 @@ class MachineSharingFormState extends State<MachineSharingForm> {
onPressed: !_busy && _value.text.trim().isNotEmpty
? () => unawaited(_add())
: null,
- child: const Text('Share'),
+ child: const Text('Invite'),
),
],
);
- final folderAddRow = Row(
- children: [
- Expanded(
- child: ReadlineKeys(
- controller: _folderValue,
- enabled: !_busy,
- onChanged: (_) {},
- child: TextField(
- key: const ValueKey('machine-sharing-folder'),
- controller: _folderValue,
- focusNode: _folderInput,
- readOnly: _busy,
- onTapOutside: (_) {},
- enableSuggestions: false,
- autocorrect: false,
- style: DesktopChrome.text(size: 13),
- cursorColor: DesktopChrome.accent,
- decoration: InputDecoration(
- hintText: 'Add a folder by its full path',
- hintStyle: muted13,
- prefixIcon: Icon(
- AppIcons.folder,
- size: AppIcons.inlineSize,
- color: DesktopChrome.muted,
- ),
- prefixIconConstraints: const BoxConstraints(minWidth: 36),
- border: fieldBorder,
- enabledBorder: _folderError == null
- ? fieldBorder
- : fieldBorder.copyWith(
- borderSide: BorderSide(color: error),
- ),
- disabledBorder: fieldBorder,
- focusedBorder: fieldBorder.copyWith(
- borderSide: BorderSide(
- color: _folderError == null
- ? DesktopChrome.focusRing
- : error,
- width: grid.AppDesktop.focusWidth,
- ),
- ),
- filled: true,
- fillColor: DesktopChrome.field,
- isDense: true,
- contentPadding: const EdgeInsets.symmetric(
- horizontal: 10,
- vertical: 11,
- ),
- ),
- onEditingComplete: () {},
- ),
- ),
+ // Adding a folder is choosing one: the macOS panel here, the folder browser on another machine.
+ // Both still take a typed path (⇧⌘G in the panel, the path field in the browser).
+ final addFolder = OutlinedButton.icon(
+ key: const ValueKey('machine-sharing:folder-choose'),
+ focusNode: _node('folder-choose'),
+ onPressed: !_busy && !_choosing ? () => unawaited(_chooseFolder()) : null,
+ icon: const Icon(AppIcons.plus, size: AppIcons.inlineSize),
+ label: const Text('Add Folder…'),
+ );
+
+ // How much a guest may do in a folder, the way a Mac's File Sharing says it.
+ Widget accessMenu(GuestFolder folder) => AppSelectField<bool>(
+ key: ValueKey('machine-sharing:folder-write:${folder.path}'),
+ focusNode: _node('folder-write:${folder.path}'),
+ value: folder.write,
+ width: 112,
+ menuWidth: 232,
+ menuAlignedToEnd: true,
+ semanticLabel: 'Access to ${_folderName(folder.path)}',
+ options: const [
+ SelectOption(
+ value: false,
+ label: 'Can view',
+ detail: 'Open and read files',
),
- const SizedBox(width: DesktopChrome.controlGap),
- FilledButton(
- key: const ValueKey('machine-sharing:folder-add'),
- focusNode: _node('folder-add'),
- onPressed: !_busy && _folderValue.text.trim().isNotEmpty
- ? () => unawaited(_addFolder())
- : null,
- child: const Text('Add'),
+ SelectOption(
+ value: true,
+ label: 'Can edit',
+ detail: 'Also change, add and delete files',
),
],
+ onChanged: (write) {
+ if (_busy || write == folder.write) return;
+ unawaited(_toggleFolderWrite(folder.path));
+ },
);
- Widget folderRow(GuestFolder folder) => Padding(
+ Widget folderRow(GuestFolder folder) => listRow(
key: ValueKey('machine-sharing-folder:${folder.path}'),
- padding: const EdgeInsets.symmetric(vertical: 4),
- child: Row(
+ mark: _disc(icon: AppIcons.folder),
+ title: _folderName(folder.path),
+ tooltip: folder.path,
+ subtitle: quiet(_folderParent(folder.path)),
+ trailing: [
+ accessMenu(folder),
+ const SizedBox(width: 4),
+ AppIconButton(
+ key: ValueKey('machine-sharing:folder-remove:${folder.path}'),
+ icon: AppIcons.close,
+ tooltip: 'Stop sharing ${_folderName(folder.path)}',
+ destructive: true,
+ focusNode: _node('folder-remove:${folder.path}'),
+ onPressed: _busy ? null : () => unawaited(_removeFolder(folder.path)),
+ ),
+ ],
+ );
+
+ Widget personRow(_Person person) => listRow(
+ key: ValueKey('machine-sharing-person:${person.email}'),
+ mark: _disc(letter: person.email),
+ title: person.email,
+ subtitle: Row(
children: [
- Icon(
- AppIcons.folder,
- size: AppIcons.inlineSize,
- color: DesktopChrome.muted,
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- folder.path,
- style: DesktopChrome.control(medium: true),
- overflow: TextOverflow.ellipsis,
- ),
- const SizedBox(height: 2),
- Text(
- folder.write ? 'Guests can edit it' : 'Read only',
- style: DesktopChrome.metadata(),
- ),
- ],
+ // Colour is never the only signal: the words say it too.
+ if (person.usingIt) ...[
+ Container(
+ width: 6,
+ height: 6,
+ decoration: BoxDecoration(
+ color: grid.AppPalette.online,
+ shape: BoxShape.circle,
+ ),
),
- ),
- Text('Can edit', style: DesktopChrome.metadata()),
- const SizedBox(width: 6),
- Switch(
- key: ValueKey('machine-sharing:folder-write:${folder.path}'),
- focusNode: _node('folder-write:${folder.path}'),
- value: folder.write,
- onChanged: _busy
- ? null
- : (_) => unawaited(_toggleFolderWrite(folder.path)),
- ),
- AppIconButton(
- key: ValueKey('machine-sharing:folder-remove:${folder.path}'),
- icon: AppIcons.close,
- tooltip: 'Stop sharing ${folder.path}',
- destructive: true,
- focusNode: _node('folder-remove:${folder.path}'),
- onPressed: _busy
- ? null
- : () => unawaited(_removeFolder(folder.path)),
- ),
+ const SizedBox(width: 6),
+ ],
+ Flexible(child: quiet(person.usingIt ? 'Joined' : 'Invited')),
],
),
+ trailing: [
+ AppIconButton(
+ key: ValueKey('machine-sharing:remove:${person.email}'),
+ icon: AppIcons.close,
+ tooltip: 'Remove ${person.email}',
+ destructive: true,
+ focusNode: _node('remove:${person.email}'),
+ onPressed: _busy ? null : () => unawaited(_remove(person.email)),
+ ),
+ ],
);
- Widget personRow(_Person person) => Padding(
- key: ValueKey('machine-sharing-person:${person.email}'),
- padding: const EdgeInsets.symmetric(vertical: 4),
- child: Row(
- children: [
- _avatar(person.email),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- person.email,
- style: DesktopChrome.control(medium: true),
- overflow: TextOverflow.ellipsis,
- ),
- const SizedBox(height: 2),
- Row(
- children: [
- // Colour is never the only signal: the words say it too.
- if (person.usingIt) ...[
- Container(
- width: 6,
- height: 6,
- decoration: BoxDecoration(
- color: grid.AppPalette.online,
- shape: BoxShape.circle,
- ),
- ),
- const SizedBox(width: 6),
- ],
- Flexible(
- child: Text(
- person.usingIt
- ? 'Using it'
- : 'Invited · not using it yet',
- style: DesktopChrome.metadata(),
- overflow: TextOverflow.ellipsis,
- ),
- ),
- ],
- ),
- ],
- ),
- ),
- AppIconButton(
- key: ValueKey('machine-sharing:remove:${person.email}'),
- icon: AppIcons.close,
- tooltip: 'Stop sharing with ${person.email}',
- destructive: true,
- focusNode: _node('remove:${person.email}'),
- onPressed: _busy ? null : () => unawaited(_remove(person.email)),
+ Widget problem(String text, Key key, {bool isError = true}) => Padding(
+ padding: const EdgeInsets.only(top: 6, left: 2),
+ child: Semantics(
+ liveRegion: true,
+ child: Text(
+ text,
+ key: key,
+ style: DesktopChrome.text(
+ size: 12,
+ color: isError ? error : DesktopChrome.muted,
),
- ],
+ ),
),
);
@@ -1062,7 +1130,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
children: [
_spinner(),
const SizedBox(width: 8),
- Text('Reading who it is shared with…', style: muted13),
+ Text('Loading…', style: muted13),
],
),
];
@@ -1091,71 +1159,29 @@ class MachineSharingFormState extends State<MachineSharingForm> {
heading,
small,
access,
- if (_guestsOff && _sharing) ...[
- small,
- Row(
- children: [
- Expanded(
- child: Text(
- _guestAccess == 'outdated'
- ? 'Guests cannot start harnesses until you turn guest access on again after the update.'
- : 'Guests cannot start harnesses until you turn guest access on.',
- style: DesktopChrome.text(size: 13),
- ),
- ),
- const SizedBox(width: DesktopChrome.controlGap),
- FilledButton(
- key: const ValueKey('machine-sharing:guests-on'),
- focusNode: _node('guests-on'),
- onPressed: _busy ? null : () => unawaited(_turnGuestsOn()),
- child: const Text('Turn on'),
- ),
- ],
- ),
- ],
+ if (_guestsOff && _sharing) ...[gap, guestsOff],
gap,
- if (_domain case final domain?) ...[domainRow(domain), gap],
- Text('People', style: DesktopChrome.control(medium: true)),
- small,
+ section('People'),
addRow,
- if (_fieldError case final problem?)
- Padding(
- padding: const EdgeInsets.only(top: 6, left: 2),
- child: Semantics(
- liveRegion: true,
- child: Text(
- problem,
- key: const ValueKey('machine-sharing:field-error'),
- style: DesktopChrome.text(
- size: 12,
- color: _fieldIsError ? error : DesktopChrome.muted,
- ),
- ),
- ),
+ if (_fieldError case final said?)
+ problem(
+ said,
+ const ValueKey('machine-sharing:field-error'),
+ isError: _fieldIsError,
),
- if (people.isNotEmpty) ...[small, ...people.map(personRow)],
+ if (people.isNotEmpty || _domain != null) small,
+ ...people.map(personRow),
+ if (_domain case final domain?) domainRow(domain),
gap,
- Text('Folders', style: DesktopChrome.control(medium: true)),
- small,
- Text(
- 'Guests can open these in their harnesses. They can read anything inside, secrets too.',
- style: muted13,
+ section(
+ 'Folders',
+ detail: 'People you share with see everything inside, even passwords and keys.',
),
- small,
- folderAddRow,
- if (_folderError case final problem?)
- Padding(
- padding: const EdgeInsets.only(top: 6, left: 2),
- child: Semantics(
- liveRegion: true,
- child: Text(
- problem,
- key: const ValueKey('machine-sharing:folder-error'),
- style: DesktopChrome.text(size: 12, color: error),
- ),
- ),
- ),
- if (_folders.isNotEmpty) ...[small, ..._folders.map(folderRow)],
+ ..._folders.map(folderRow),
+ if (_folders.isNotEmpty) small,
+ Align(alignment: AlignmentDirectional.centerStart, child: addFolder),
+ if (_folderError case final said?)
+ problem(said, const ValueKey('machine-sharing:folder-error')),
];
}
@@ -1210,7 +1236,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
),
gap,
if (_loading)
- line('Reading who it is shared with…', color: theme.muted)
+ line('Loading…', color: theme.muted)
else if (_unavailable case final reason?) ...[
line(reason, color: theme.yellow),
gap,
@@ -1220,7 +1246,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
if (_guestsOff && _sharing)
action(
'guests-on',
- 'Turn guest access on',
+ 'Turn on sharing',
_busy ? null : () => unawaited(_turnGuestsOn()),
),
gap,
@@ -1274,7 +1300,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
children: [
Expanded(
child: line(
- '${person.email} ${person.usingIt ? 'using it' : 'invited'}',
+ '${person.email} ${person.usingIt ? 'joined' : 'invited'}',
),
),
action(
@@ -1286,7 +1312,7 @@ class MachineSharingFormState extends State<MachineSharingForm> {
),
gap,
line(
- 'Folders guests can open. They can read anything inside, secrets too.',
+ 'Folders they can open. They see everything inside, including passwords or keys.',
color: theme.muted,
),
Row(
@@ -1359,3 +1385,15 @@ class MachineSharingFormState extends State<MachineSharingForm> {
);
}
}
+
+/// A folder's own name: what a person recognises it by.
+String _folderName(String path) {
+ final parts = path.split('/').where((part) => part.isNotEmpty);
+ return parts.isEmpty ? '/' : parts.last;
+}
+
+/// Where it is: the folder that holds it.
+String _folderParent(String path) {
+ final cut = path.lastIndexOf('/');
+ return cut <= 0 ? '/' : path.substring(0, cut);
+}
diff --git a/desktop/lib/widgets/swarm_resource_preview.dart b/desktop/lib/widgets/swarm_resource_preview.dart
index 8b7d09f58..93cc6bd5b 100644
--- a/desktop/lib/widgets/swarm_resource_preview.dart
+++ b/desktop/lib/widgets/swarm_resource_preview.dart
@@ -1689,7 +1689,7 @@ class _SwarmResourcePreviewState extends State<SwarmResourcePreview> {
if (machine.isLocalMachine) 'This computer',
if (machine.machine.isShared) 'View only',
if (machine.machine.machineShare case final share?)
- 'Guest · shared by ${share.owner}',
+ 'Shared by ${share.owner}',
].join(' · '),
'',
// A guest's harnesses run as their own account there, on the owner's plans
@@ -2081,6 +2081,7 @@ class _SwarmResourcePreviewState extends State<SwarmResourcePreview> {
onClose: _closeMachineForm,
onFocusChanged: widget.search.setManaging,
onSwitchPane: _switchPane,
+ onModalChanged: widget.onModalChanged,
)
: _editingMachine
? MachinePickerForm(
diff --git a/desktop/test/machine_sharing_form_test.dart b/desktop/test/machine_sharing_form_test.dart
index 4fa75c41e..49d8b6949 100644
--- a/desktop/test/machine_sharing_form_test.dart
+++ b/desktop/test/machine_sharing_form_test.dart
@@ -123,6 +123,7 @@ void main() {
WidgetTester tester,
_SharingApp app, {
Brightness brightness = Brightness.dark,
+ Future<String?> Function(BuildContext context)? chooseFolder,
}) async {
// The app's tokens follow their own brightness (main.dart's _GridTokenScope), not the theme's.
final saved = grid.AppTheme.brightness.value;
@@ -158,6 +159,7 @@ void main() {
closed = message;
},
onFocusChanged: (_) {},
+ chooseFolder: chooseFolder,
),
),
),
@@ -200,7 +202,9 @@ void main() {
await tester.tap(find.byKey(const ValueKey('machine-sharing:add')));
await tester.pumpAndSettle();
expect(
- find.text('“bitcoinbuilder.ai@!gmail.com” is not an email address.'),
+ find.text(
+ '“bitcoinbuilder.ai@!gmail.com” isn’t a valid email address.',
+ ),
findsOneWidget,
);
expect(app.sets, isEmpty);
@@ -228,15 +232,15 @@ void main() {
expect(app.sets.last.emails, ['[email protected]', '[email protected]']);
// A share that went through says nothing: the list shows it.
expect(find.text('Shared with 2 people.'), findsNothing);
- expect(find.text('Using it'), findsOneWidget);
- expect(find.text('Invited · not using it yet'), findsOneWidget);
+ expect(find.text('Joined'), findsOneWidget);
+ expect(find.text('Invited'), findsOneWidget);
// Everyone at the domain: the switch applies at once.
await tester.tap(find.byKey(const ValueKey('machine-sharing:domain')));
await tester.pumpAndSettle();
expect(app.sets.last.sameDomain, isTrue);
expect(
- find.text('Anyone with an @autonomous.ai address can use it.'),
+ find.text('Anyone with an @autonomous.ai email can use it.'),
findsOneWidget,
);
await _snap(tester, boundary, 'share-people-dark');
@@ -260,7 +264,7 @@ void main() {
await tester.pump();
await tester.tap(find.byKey(const ValueKey('machine-sharing:add')));
await tester.pumpAndSettle();
- expect(find.text('Already shared with [email protected].'), findsOneWidget);
+ expect(find.text('[email protected] already has access.'), findsOneWidget);
expect(app.sets.last.emails, ['[email protected]']);
// A refusal says why and changes nothing.
@@ -303,14 +307,12 @@ void main() {
expect(find.textContaining('full access'), findsNothing);
expect(
find.textContaining(
- 'Guests get their own space on this machine and can use your Claude and ChatGPT plans.',
+ 'People you invite get their own private space here and use your Claude and ChatGPT plans.',
),
findsOneWidget,
);
expect(
- find.textContaining(
- 'Sharing asks for an admin password on this machine once.',
- ),
+ find.textContaining('You’ll enter your password once to set this up.'),
findsOneWidget,
);
@@ -334,7 +336,7 @@ void main() {
await tester.pumpAndSettle();
expect(app.enables, 2);
expect(app.sets.single.sameDomain, isTrue);
- expect(find.textContaining('admin password'), findsNothing);
+ expect(find.textContaining('enter your password'), findsNothing);
await tester.enterText(
find.byKey(const ValueKey('machine-sharing-email')),
@@ -348,76 +350,81 @@ void main() {
);
testWidgets(
- 'shares folders with guests, read only until the switch lets them edit, and says why one cannot be',
+ 'shares folders chosen on that machine, view only until Can edit, and says why one cannot be',
(tester) async {
final app = _SharingApp();
- final (closed, _) = await open(tester, app);
+ final picks = <String?>[];
+ var asked = 0;
+ final (closed, boundary) = await open(
+ tester,
+ app,
+ chooseFolder: (_) async {
+ asked++;
+ return picks.removeAt(0);
+ },
+ );
+ expect(find.textContaining('even passwords and keys.'), findsOneWidget);
+ // Nothing to type: Add Folder chooses one on that machine.
expect(
- find.textContaining('They can read anything inside, secrets too.'),
- findsOneWidget,
+ find.byKey(const ValueKey('machine-sharing-folder')),
+ findsNothing,
);
- final field = find.byKey(const ValueKey('machine-sharing-folder'));
- final add = find.byKey(const ValueKey('machine-sharing:folder-add'));
+ final add = find.byKey(const ValueKey('machine-sharing:folder-choose'));
+ expect(find.text('Add Folder…'), findsOneWidget);
- // A path that is not a full one is named, and nothing is sent.
- await tester.enterText(field, 'code/app');
- await tester.pump();
+ // Cancelled, by click and then by Enter on the button it leaves focused: nothing changes.
+ picks.addAll([null, null]);
await tester.tap(add);
await tester.pumpAndSettle();
- expect(
- find.text(
- 'Enter the folder’s full path on this machine, like /Users/you/project.',
- ),
- findsOneWidget,
- );
+ await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+ await tester.pumpAndSettle();
+ expect(asked, 2);
expect(app.folderSets, isEmpty);
- // Shared read only.
- await tester.enterText(field, '/Users/dee/code/app/');
- await tester.pump();
+ // Chosen: shared view only, named by the folder with where it is beneath.
+ picks.add('/Users/dee/code/app/');
await tester.tap(add);
await tester.pumpAndSettle();
expect(app.folderSets.last, [
(path: '/Users/dee/code/app', write: false),
]);
- expect(find.text('/Users/dee/code/app'), findsOneWidget);
- expect(find.text('Read only'), findsOneWidget);
+ expect(find.text('app'), findsOneWidget);
+ expect(find.text('/Users/dee/code'), findsOneWidget);
+ expect(find.text('Can view'), findsOneWidget);
+ await _snap(tester, boundary, 'share-folders-dark');
// Once is enough.
- await tester.enterText(field, '/Users/dee/code/app');
- await tester.pump();
+ picks.add('/Users/dee/code/app');
await tester.tap(add);
await tester.pumpAndSettle();
- expect(
- find.text('Guests can already use /Users/dee/code/app.'),
- findsOneWidget,
- );
+ expect(find.text('app is already shared.'), findsOneWidget);
expect(app.folderSets, hasLength(1));
- // The switch lets them edit it.
+ // Can edit, from the folder's access menu.
await tester.tap(
find.byKey(
const ValueKey('machine-sharing:folder-write:/Users/dee/code/app'),
),
);
await tester.pumpAndSettle();
+ expect(find.text('Also change, add and delete files'), findsOneWidget);
+ await tester.tap(find.text('Can edit').last);
+ await tester.pumpAndSettle();
expect(app.folderSets.last, [(path: '/Users/dee/code/app', write: true)]);
- expect(find.text('Guests can edit it'), findsOneWidget);
+ expect(find.text('Can edit'), findsOneWidget);
// The machine refuses one that is not the owner's, in words, and nothing changes.
app.folderRefusal = {
'error': 'BAD_REQUEST',
'message': 'Only your own folders can be shared: /Users/kim',
};
- await tester.enterText(field, '/Users/kim');
- await tester.pump();
+ picks.add('/Users/kim');
await tester.tap(add);
await tester.pumpAndSettle();
expect(
find.text('Only your own folders can be shared: /Users/kim'),
findsOneWidget,
);
- // Kept in the field to correct, never listed.
expect(
find.byKey(const ValueKey('machine-sharing-folder:/Users/kim')),
findsNothing,
@@ -432,7 +439,7 @@ void main() {
);
await tester.pumpAndSettle();
expect(app.folderSets.last, isEmpty);
- expect(find.text('/Users/dee/code/app'), findsNothing);
+ expect(find.text('app'), findsNothing);
await tester.tap(find.byKey(const ValueKey('machine-sharing:back')));
await tester.pump();
expect(closed(), 'Not shared.');
@@ -450,11 +457,10 @@ void main() {
'members': <Map<String, dynamic>>[],
'guestAccess': 'outdated',
};
- await open(tester, app);
+ final (_, boundary) = await open(tester, app);
+ await _snap(tester, boundary, 'share-guests-off-dark');
expect(
- find.text(
- 'Guests cannot start harnesses until you turn guest access on again after the update.',
- ),
+ find.text('People you added can’t use it since the update.'),
findsOneWidget,
);
await tester.tap(find.byKey(const ValueKey('machine-sharing:guests-on')));
@@ -490,7 +496,7 @@ void main() {
// members hold the whole domain, and none of them is a row of their own.
expect(find.text('[email protected]'), findsNothing);
expect(find.textContaining('added from'), findsNothing);
- expect(find.text('Using it'), findsOneWidget);
+ expect(find.text('Joined'), findsOneWidget);
expect(
find.byKey(const ValueKey('machine-sharing:remove:[email protected]')),
findsOneWidget,
diff --git a/desktop/test/new_harness_guest_test.dart b/desktop/test/new_harness_guest_test.dart
index d706aa85d..37b4cbc39 100644
--- a/desktop/test/new_harness_guest_test.dart
+++ b/desktop/test/new_harness_guest_test.dart
@@ -265,7 +265,7 @@ void main() {
for (final code in ['GUEST_NOT_ALLOWED', 'GUEST_HARNESS']) {
expect(
retargetRefusalMessage(code, engineLabel: 'Claude Code'),
- 'A guest’s harness keeps the model it started with. Start a new one to use another.',
+ 'On a computer shared with you, a harness keeps the model it started with. Start a new one to use another.',
);
}
});
@@ -287,7 +287,7 @@ void main() {
expect(resumed.retryable, isFalse);
expect(
await app.changeAgent('dee', 'mine', 'codex'),
- 'A guest’s harness keeps the agent it started with. Start a new one.',
+ 'On a computer shared with you, a harness keeps the agent it started with. Start a new one.',
);
});
}
diff --git a/tui/src/devices.rs b/tui/src/devices.rs
index bcce87d32..e9d4cd409 100644
--- a/tui/src/devices.rs
+++ b/tui/src/devices.rs
@@ -43,7 +43,7 @@ pub const LOGIN: &str = "harness login";
pub const START: &str = "harness start && harness remote-password set";
/// What sharing this computer gives (machine_sharing_form.dart's intro).
/// What a guest gets (docs/plans/2026-10-19-guest-machine-sharing-plan.md): Guest is the only level.
-const SHARE_ACCESS: &str = "Guests get their own space here and can use your Claude and ChatGPT plans. They cannot see your files or harnesses.";
+const SHARE_ACCESS: &str = "People you invite get their own private space here and use your Claude and ChatGPT plans. They can't see your files or harnesses.";
/// Where the Add Phone QR points (add_phone_dialog.dart `phonePairLink`): the phone parses exactly
/// this, so the TUI's code is the app's, byte for byte.
@@ -814,7 +814,7 @@ fn run_act(app: &mut App, act: Act) {
// admin prompt on this computer. A CLI from before guests says nothing of it, and is not asked.
let access = app.devices.sharing.as_ref().and_then(|s| s.as_ref().ok()).and_then(|v| v.get("guestAccess")).and_then(Value::as_str).map(str::to_string);
if (!emails.is_empty() || same_domain) && access.as_deref().is_some_and(|a| a != "ready") {
- note(app, "Approve the prompt on this computer: it lets each guest run as their own account.");
+ note(app, "Enter your password on this computer to finish setting up.");
ask(app, Req::Rpc { ty: "shared_machines", payload: json!({ "action": "enable_guests" }) }, None, move |app, reply| {
match shared_answer(reply) {
Ok(v) => {
@@ -1020,21 +1020,21 @@ fn submit(app: &mut App, what: Entry, value: String) {
if new.is_empty() { return note(app, "Already shared with them") }
emails.extend(new.iter().cloned());
let here = app.fleet.local_machine_name();
- confirm(app, format!("Share {here} with {}? They get their own space, as guests, and use your Claude and ChatGPT plans.", new.join(", ")),
+ confirm(app, format!("Share {here} with {}? They get their own private space and use your Claude and ChatGPT plans.", new.join(", ")),
Act::Share { emails, same_domain, said: format!("Shared with {}", new.join(", ")) });
}
Entry::ShareFolder { write } => {
let typed = value.trim();
let path = if typed.len() > 1 { typed.trim_end_matches('/') } else { typed }.to_string();
if path.is_empty() { return note(app, "Nothing changed") }
- let label = if write { "Folder guests can edit" } else { "Folder guests can read" };
+ let label = if write { "Share a folder they can edit" } else { "Share a folder they can view" };
if !path.starts_with('/') { entry(app, Entry::ShareFolder { write }, label, &value, false); return fail(app, "Enter the folder's full path, like /Users/you/project") }
let mut folders = sharing_folders(app);
- if folders.iter().any(|(p, _)| *p == path) { return note(app, format!("Guests can already use {path}")) }
+ if folders.iter().any(|(p, _)| *p == path) { return note(app, format!("{path} is already shared")) }
folders.push((path.clone(), write));
- let what = if write { "read and change" } else { "read" };
- confirm(app, format!("Let guests {what} {path}? They can read anything in it, secrets too."),
- Act::ShareFolders { folders, said: format!("Guests can use {path}") });
+ let what = if write { "view and edit" } else { "view" };
+ confirm(app, format!("Share {path} so people can {what} it? They see everything inside, even passwords and keys."),
+ Act::ShareFolders { folders, said: format!("Shared {path}") });
}
Entry::Rename { machine, name } => {
let new = value.trim().to_string();
@@ -1268,7 +1268,7 @@ fn share_action(app: &mut App, rest: &str) {
if same_domain {
run_act(app, Act::Share { emails, same_domain: false, said: format!("No longer shared with everyone at @{domain}") })
} else {
- confirm(app, format!("Share {here} with everyone at @{domain}? They get their own space, as guests, and use your Claude and ChatGPT plans."),
+ confirm(app, format!("Share {here} with everyone at @{domain}? They get their own private space and use your Claude and ChatGPT plans."),
Act::Share { emails, same_domain: true, said: format!("Shared with everyone at @{domain}") })
}
}
@@ -1277,23 +1277,23 @@ fn share_action(app: &mut App, rest: &str) {
confirm(app, format!("Stop sharing {here} with {email}?"), Act::Share { emails: rest, same_domain, said: format!("No longer shared with {email}") })
}
("guests-on", _) => {
- note(app, "Approve the prompt on this computer: it lets each guest run as their own account.");
+ note(app, "Enter your password on this computer to finish setting up.");
ask(app, Req::Rpc { ty: "shared_machines", payload: json!({ "action": "enable_guests" }) }, None, move |app, reply| {
match shared_answer(reply) {
Ok(v) => {
if let Some(Ok(sharing)) = app.devices.sharing.as_mut() { sharing["guestAccess"] = v.get("guestAccess").cloned().unwrap_or(json!("ready")) }
- note(app, "Guest access is on")
+ note(app, "Sharing is on")
}
Err(message) => fail(app, message),
}
again(app);
});
}
- ("folder-read", _) => entry(app, Entry::ShareFolder { write: false }, "Folder guests can read", "", false),
- ("folder-write", _) => entry(app, Entry::ShareFolder { write: true }, "Folder guests can edit", "", false),
+ ("folder-read", _) => entry(app, Entry::ShareFolder { write: false }, "Share a folder they can view", "", false),
+ ("folder-write", _) => entry(app, Entry::ShareFolder { write: true }, "Share a folder they can edit", "", false),
("folder", path) => {
let rest: Vec<(String, bool)> = sharing_folders(app).into_iter().filter(|(p, _)| p != path).collect();
- confirm(app, format!("Stop sharing {path} with guests?"), Act::ShareFolders { folders: rest, said: format!("Guests can no longer use {path}") })
+ confirm(app, format!("Stop sharing {path}?"), Act::ShareFolders { folders: rest, said: format!("Stopped sharing {path}") })
}
_ => {}
}
@@ -1455,7 +1455,7 @@ fn machines_rows(app: &App) -> Vec<Row> {
_ => "…".into(),
};
rows.push(Row::new("share:", "Share this computer…").group(here).extra("share sharing people team domain").lead(dot("⇆", theme::TEAL))
- .detail(vec![span("with people you choose, as guests", fg(theme::MUTED))]).right(state));
+ .detail(vec![span("with people you choose", fg(theme::MUTED))]).right(state));
}
let yours = "Your machines";
@@ -1474,7 +1474,7 @@ fn machines_rows(app: &App) -> Vec<Row> {
let (glyph, color, word) = reach(app, m);
let rtt = app.rtt.get(&m.id).filter(|_| m.usable()).map(|d| format!("{}ms ", d.as_millis())).unwrap_or_default();
rows.push(Row::new(format!("m:{}", m.id), m.name.clone()).group(with_you).extra(format!("{} {} {}", m.id, share.owner, share.email)).lead(dot(glyph, color))
- .detail(vec![span(format!("guest · shared by {} · ", share.owner), fg(theme::MUTED)), span(word, fg(color))]).right(format!("{rtt}{}", counts(app, &m.id))));
+ .detail(vec![span(format!("shared by {} · ", share.owner), fg(theme::MUTED)), span(word, fg(color))]).right(format!("{rtt}{}", counts(app, &m.id))));
}
// Shared with this account's domain: Enter adds one.
let team = "Shared with your team";
@@ -1533,7 +1533,7 @@ fn action_rows(app: &App, id: &str) -> Vec<Row> {
/// This computer's sharing: everyone at its domain, the addresses, and who uses it now.
fn share_rows(app: &App) -> Vec<Row> {
let here = format!("Share {}", app.fleet.local_machine_name());
- let mut rows = vec![info("share-what", "Guests get their own space here.", &here)];
+ let mut rows = vec![info("share-what", "People you invite get a private space here.", &here)];
let Some((emails, same_domain, domain)) = sharing_now(app) else {
match &app.devices.sharing {
Some(Err(message)) => {
@@ -1547,12 +1547,12 @@ fn share_rows(app: &App) -> Vec<Row> {
// Shared already, but guests start nothing until guest access is on (again, after an update).
let access = guest_access(app);
if (!emails.is_empty() || same_domain) && access.as_deref().is_some_and(|a| a != "ready") {
- rows.push(Row::new("shr:guests-on", "Turn guest access on…").group(here.clone()).extra("guest access admin").lead(dot("!", theme::WARN))
- .detail(vec![span(if access.as_deref() == Some("outdated") { "again, after the update" } else { "guests cannot start harnesses yet" }, fg(theme::MUTED))]));
+ rows.push(Row::new("shr:guests-on", "Turn on sharing…").group(here.clone()).extra("sharing guest access admin").lead(dot("!", theme::WARN))
+ .detail(vec![span(if access.as_deref() == Some("outdated") { "people you added can't use it since the update" } else { "people you added can't use it yet" }, fg(theme::MUTED))]));
}
if let Some(domain) = &domain {
rows.push(Row::new("shr:domain", format!("Everyone at @{domain}")).group(here.clone()).extra("domain team company").lead(dot(if same_domain { "✓" } else { "·" }, if same_domain { theme::ONLINE } else { theme::MUTED }))
- .detail(vec![span("as guests", fg(theme::MUTED))]).right(if same_domain { "on" } else { "off" }));
+ .detail(vec![span("no invite needed", fg(theme::MUTED))]).right(if same_domain { "on" } else { "off" }));
}
rows.push(Row::new("shr:add", "Add an email…").group(here.clone()).extra("add email person").lead(dot("+", theme::TEAL)).detail(vec![span("they see it in their Machines", fg(theme::MUTED))]));
for email in &emails {
@@ -1561,9 +1561,9 @@ fn share_rows(app: &App) -> Vec<Row> {
let using = using_by_email(app);
if !using.is_empty() { rows.push(info("share-using", format!("Using it now: {}", using.join(", ")), &here)) }
// The folders guests may open in their harnesses (docs/plans/2026-10-19-guest-machine-sharing-plan.md).
- let folders = "Folders guests can open";
- rows.push(Row::new("shr:folder-read", "Share a folder (read only)…").group(folders).extra("folder share read").lead(dot("+", theme::TEAL)));
- rows.push(Row::new("shr:folder-write", "Share a folder guests can edit…").group(folders).extra("folder share edit write").lead(dot("+", theme::TEAL)));
+ let folders = "Shared folders";
+ rows.push(Row::new("shr:folder-read", "Share a folder they can view…").group(folders).extra("folder share read").lead(dot("+", theme::TEAL)));
+ rows.push(Row::new("shr:folder-write", "Share a folder they can edit…").group(folders).extra("folder share edit write").lead(dot("+", theme::TEAL)));
for (path, write) in sharing_folders(app) {
rows.push(Row::new(format!("shr:folder:{path}"), path.clone()).group(folders).extra("folder remove").lead(dot("·", theme::MUTED))
.right(if write { "can edit" } else { "read only" }));
@@ -1763,41 +1763,41 @@ fn share_preview(app: &App, rest: &str) -> Vec<Line<'static>> {
("domain", _) => {
let Some(d) = domain else { return vec![] };
let mut out = vec![bold(format!("Everyone at @{d}")).into(), Line::raw(""),
- Line::raw(format!("Anyone with an @{d} address can use it as a guest: their own space, on your Claude and ChatGPT plans.")), Line::raw(""),
+ Line::raw(format!("Anyone with an @{d} email can use it, no invite needed. They get their own private space and use your Claude and ChatGPT plans.")), Line::raw(""),
kv("now", if same_domain { "on" } else { "off" })];
out.extend(enter_does(if same_domain { format!("stops sharing with everyone at @{d}; people you added by email keep it") } else { "asks y/n, then shares it with them".into() }));
out
}
("add", _) => {
- let mut out = vec![bold("Add people").into(), Line::raw(""), Line::raw("They see it in their Machines and use it as guests: their own space, on your Claude and ChatGPT plans."),
+ let mut out = vec![bold("Add people").into(), Line::raw(""), Line::raw("They see it in their Machines. They get their own private space and use your Claude and ChatGPT plans."),
Line::raw(""), dim("Several at once: separate the addresses with commas or spaces.").into()];
out.extend(enter_does("asks for their email addresses, then y/n"));
out
}
("rm", email) => {
let using = members.iter().any(|(e, _)| e == email);
- let mut out = vec![bold(email.to_string()).into(), Line::raw(""), kv("status", if using { "using it" } else { "invited · not using it yet" })];
+ let mut out = vec![bold(email.to_string()).into(), Line::raw(""), kv("status", if using { "joined" } else { "invited" })];
out.extend(enter_does("asks y/n, then stops sharing with them — they lose access at once"));
out
}
("guests-on", _) => {
- let mut out = vec![bold("Turn guest access on").into(), Line::raw(""),
- Line::raw("Each guest's harnesses run as their own account on this computer, so they cannot see your files. That takes one admin password here.")];
+ let mut out = vec![bold("Turn on sharing").into(), Line::raw(""),
+ Line::raw("Each person you share with gets their own account on this computer, so they can't see your files. You enter your password once to set this up.")];
out.extend(enter_does("shows this computer's admin prompt"));
out
}
("folder-read" | "folder-write", _) => {
let write = rest == "folder-write";
- let mut out = vec![bold(if write { "Share a folder guests can edit" } else { "Share a folder" }).into(), Line::raw(""),
- Line::raw(if write { "Guests' harnesses can open it, and read and change what is in it." } else { "Guests' harnesses can open it and read what is in it." }),
- Line::raw(""), Line::styled("They can read anything inside, secrets too.", fg(theme::WARN))];
+ let mut out = vec![bold(if write { "Share a folder they can edit" } else { "Share a folder they can view" }).into(), Line::raw(""),
+ Line::raw(if write { "People you share with can open it and change, add or delete files." } else { "People you share with can open it and read the files." }),
+ Line::raw(""), Line::styled("They see everything inside, even passwords and keys.", fg(theme::WARN))];
out.extend(enter_does("asks for the folder's full path, then y/n"));
out
}
("folder", path) => {
let write = sharing_folders(app).iter().any(|(p, w)| p == path && *w);
- let mut out = vec![bold(path.to_string()).into(), Line::raw(""), kv("guests", if write { "can read and change it" } else { "can read it" })];
- out.extend(enter_does("asks y/n, then stops sharing it with guests"));
+ let mut out = vec![bold(path.to_string()).into(), Line::raw(""), kv("access", if write { "can edit" } else { "can view" })];
+ out.extend(enter_does("asks y/n, then stops sharing it"));
out
}
_ => vec![],
@@ -2284,7 +2284,7 @@ mod tests {
assert!(app.devices.ask.is_some(), "everyone at the domain is asked first");
// They use it straight away, as people named by email do: nothing to add first.
assert!(matches!(&app.devices.ask, Some(Ask::Confirm { question, .. })
- if question.ends_with("with everyone at @acme.io? They get their own space, as guests, and use your Claude and ChatGPT plans.")), "{:?}", app.devices.ask);
+ if question.ends_with("with everyone at @acme.io? They get their own private space and use your Claude and ChatGPT plans.")), "{:?}", app.devices.ask);
press(&mut app, KeyCode::Char('Y'));
assert!(has(&log, &rpc("set", json!({ "emails": [], "sameDomain": true }))));
assert_eq!(row_of(&app, "shr:domain").map(|r| r.right.clone()), Some("on".into()));
@@ -2366,11 +2366,11 @@ mod tests {
open(&mut app, View::Machines);
go_to(&mut app, "share:");
press(&mut app, KeyCode::Enter);
- assert!(row_of(&app, "shr:guests-on").is_some_and(|r| r.detail.iter().any(|s| s.content.contains("after the update"))));
+ assert!(row_of(&app, "shr:guests-on").is_some_and(|r| r.detail.iter().any(|s| s.content.contains("since the update"))));
go_to(&mut app, "shr:guests-on");
press(&mut app, KeyCode::Enter);
assert!(has(&log, &rpc("enable_guests", json!({}))));
- assert!(app.devices.footer.as_ref().is_some_and(|(t, err, _)| !err && t == "Guest access is on"));
+ assert!(app.devices.footer.as_ref().is_some_and(|(t, err, _)| !err && t == "Sharing is on"));
assert!(row_of(&app, "shr:guests-on").is_none());
}
@@ -2394,7 +2394,7 @@ mod tests {
press(&mut app, KeyCode::Enter);
typed(&mut app, "/Users/dee/docs/");
press(&mut app, KeyCode::Enter);
- assert!(matches!(&app.devices.ask, Some(Ask::Confirm { question, .. }) if question.contains("secrets too")), "{:?}", app.devices.ask);
+ assert!(matches!(&app.devices.ask, Some(Ask::Confirm { question, .. }) if question.contains("even passwords and keys")), "{:?}", app.devices.ask);
press(&mut app, KeyCode::Char('Y'));
assert!(has(&log, &rpc("set_folders", json!({ "folders": [{ "path": "/Users/dee/docs", "write": false }] }))));
assert_eq!(row_of(&app, "shr:folder:/Users/dee/docs").map(|r| r.right.clone()), Some("read only".into()));
@@ -2421,8 +2421,8 @@ mod tests {
assert!(has(&log, &rpc("set_folders", json!({ "folders": [{ "path": "/Users/dee/code/app", "write": true }] }))));
assert!(row_of(&app, "shr:folder:/Users/dee/docs").is_none());
let text = |id: &str| preview(&app, View::Machines, id).iter().map(|l| l.spans.iter().map(|s| s.content.as_ref()).collect::<String>()).collect::<Vec<_>>().join("\n");
- assert!(text("shr:folder-write").contains("secrets too"));
- assert!(text("shr:folder:/Users/dee/code/app").contains("can read and change it"));
+ assert!(text("shr:folder-write").contains("even passwords and keys"));
+ assert!(text("shr:folder:/Users/dee/code/app").contains("can edit"));
}
// Seen 2026-10-16: the list is about fifty columns, so the sharing rows were cut short, and
@@ -2445,14 +2445,14 @@ mod tests {
assert!(text("account").starts_with("Signed in as [email protected]."), "{}", text("account"));
let share = text("share:");
- for said in ["Guests get their own space", "everyone at @acme.io · on", "[email protected]", "[email protected]", "using it [email protected]"] { assert!(share.contains(said), "{said}: {share}") }
+ for said in ["People you invite get their own private space", "everyone at @acme.io · on", "[email protected]", "[email protected]", "using it [email protected]"] { assert!(share.contains(said), "{said}: {share}") }
// Everyone at the domain may use it, and is the domain row: nobody at it is named one by one.
assert!(!share.contains("[email protected]"), "{share}");
let domain = text("shr:domain");
- assert!(domain.contains("Anyone with an @acme.io address can use it as a guest: their own space, on your Claude and ChatGPT plans."), "{domain}");
+ assert!(domain.contains("Anyone with an @acme.io email can use it, no invite needed. They get their own private space and use your Claude and ChatGPT plans."), "{domain}");
assert!(!domain.contains("[email protected]") && !domain.contains("add it from"), "{domain}");
assert!(domain.contains("people you added by email keep it"));
- assert!(text("shr:rm:[email protected]").contains("using it") && text("shr:rm:[email protected]").contains("invited · not using it yet"));
+ assert!(text("shr:rm:[email protected]").contains("joined") && text("shr:rm:[email protected]").contains("invited"));
assert!(text(&format!("m:{SHARED}")).contains("Dee ([email protected])") && !text(&format!("m:{SHARED}")).contains("remove from your machines"));
assert!(text(&format!("addshared:{TEAM}")).contains("Dee ([email protected])"));
for id in ["share:", "shr:domain", "shr:add", "shr:rm:[email protected]", "shr:reload", &format!("addshared:{TEAM}"), &format!("act:open:{SHARED}")] {
@@ -2463,7 +2463,7 @@ mod tests {
go_to(&mut app, "share:");
press(&mut app, KeyCode::Enter);
assert!(row_of(&app, "share-what").is_some_and(|r| r.label.chars().count() <= 44));
- assert!(row_of(&app, "shr:domain").is_some_and(|r| r.detail.iter().any(|s| s.content == "as guests")));
+ assert!(row_of(&app, "shr:domain").is_some_and(|r| r.detail.iter().any(|s| s.content == "no invite needed")));
assert_eq!(row_of(&app, "share-using").map(|r| r.label.as_str()), Some("Using it now: [email protected]"));
}