Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(spaces): prefill the computer name and explain host setup in plain words (CUA-1862) (#5440)

Francesco Bonacci9215d41ae20f
diff --git a/apps/cua-spaces-desktop/src/bridge/machines.ts b/apps/cua-spaces-desktop/src/bridge/machines.ts
index d085e0172a..60d6b37383 100644
--- a/apps/cua-spaces-desktop/src/bridge/machines.ts
+++ b/apps/cua-spaces-desktop/src/bridge/machines.ts
@@ -8,13 +8,18 @@
import type { AppModel } from "../model/app-model";
import type { BridgeContext } from "./context";
import type { Handlers } from "./host";
+import { computerName } from "../model/devices";
import { encode } from "./value";
/** This machine as a host (the core's flattened `HostStatus`), plus its relay machine id and setup progress; null until it answered. */
export function hostStatus(model: AppModel): unknown {
const state = model.host.state;
if (!state) return null;
- return { ...(encode(state) as Record<string, unknown>), machineId: model.host.machineId, progress: model.host.progress };
+ const out: Record<string, unknown> = { ...(encode(state) as Record<string, unknown>), machineId: model.host.machineId, progress: model.host.progress };
+ // Before setup the host has no name yet: the web UI's setup form starts
+ // with what the system calls this computer.
+ if (!state.configured && !out.name) out.name = computerName();
+ return out;
}
/** `relay:<machine>` rows' reported hostnames, by machine id. */
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/HostModel.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/HostModel.swift
index 76c858eae8..d663b23661 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/HostModel.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/HostModel.swift
@@ -155,6 +155,10 @@ public final class HostModel {
public private(set) var machineId: String?
/// The host setup form, while it shows.
public private(set) var form: AppHostFormState?
+ /// What the system calls this computer (Sharing's Computer Name), which
+ /// the setup form's Name starts with: `cua host setup` uses the same
+ /// name when none is given. Tests pin it.
+ public var computerName: () -> String? = { Foundation.Host.current().localizedName }
public private(set) var busy = false
public private(set) var error: String?
/// The last page button that failed (a setting, Stop sharing, ...), in
@@ -229,6 +233,9 @@ public final class HostModel {
public func openForm() {
form = appHostFormInitial()
+ if let name = computerName()?.trimmingCharacters(in: .whitespacesAndNewlines), !name.isEmpty {
+ send(.setName(name: name))
+ }
error = nil
setupFailure = nil
}
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/ThisMachineView.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/ThisMachineView.swift
index 67f3378aa5..f9e713e5dc 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/ThisMachineView.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/ThisMachineView.swift
@@ -356,7 +356,8 @@ struct HostFormView: View {
if let v = host.formView {
Form {
Section {
- Text(v.lede).foregroundStyle(.secondary).lineLimit(1).help(v.lede)
+ // Wraps: the lede says what the chosen option does.
+ Text(v.lede).foregroundStyle(.secondary).fixedSize(horizontal: false, vertical: true)
ForEach(v.fields.filter { !$0.advanced }, id: \.id) { field($0) }
Button {
host.send(.toggleAdvanced)
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift
index bbf6651c5a..ca941dc6f0 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift
@@ -755,6 +755,11 @@ final class WebUIBridge: NSObject, WKScriptMessageHandlerWithReply {
guard let state = model.host.state, var out = BridgeValue.encode(state) as? [String: Any] else { return NSNull() }
out["machineId"] = model.host.machineId ?? NSNull()
out["progress"] = model.host.progress ?? NSNull()
+ // Before setup the host has no name yet: the web UI's setup form
+ // starts with what the system calls this Mac, as the native one does.
+ if !state.configured, (out["name"] as? String)?.isEmpty ?? true, let name = model.host.computerName() {
+ out["name"] = name
+ }
return out
}
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/OnboardingTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/OnboardingTests.swift
index da119a6296..ed6f212c80 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/OnboardingTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/OnboardingTests.swift
@@ -343,7 +343,7 @@ struct OnboardingTests {
#expect(o.state.mode == .host)
#expect(o.hostPermissions.map(\.id) == ["accessibility"])
#expect(!o.showingHostForm)
- #expect(o.view.summary.last?.value == "Set up for unattended access")
+ #expect(o.view.summary.last?.value == "Reachable from your other devices")
}
@Test func directSetupNeedsAnAddressAndSendsNoToken() async {
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift
index be2d39dabc..e668f5c825 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift
@@ -422,6 +422,7 @@ struct SnapshotTests {
#expect(m.host.panel.intro != nil)
#expect(m.host.panel.setupChoices.map(\.id) == ["desktop", "spare"])
try assertSnapshot(ThisMachineView(host: m.host), "this-machine-unset", size: CGSize(width: 640, height: 420))
+ m.host.computerName = { "Ada’s MacBook Pro" }
m.host.openForm()
try assertSnapshot(ThisMachineView(host: m.host), "host-setup", size: CGSize(width: 640, height: 420))
m.host.send(.setName(name: "Studio"))
@@ -748,6 +749,7 @@ struct SnapshotTests {
o.finishAgents(skipped: true)
o.send(.presentationDone)
o.send(.driveContinue)
+ o.host.computerName = { "Ada’s MacBook Pro" }
o.host.openForm()
try assertSnapshot(OnboardingView(onboarding: o), "onboarding-host-form", size: CGSize(width: 820, height: 560))
}
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/host-setup.png b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/host-setup.png
index 4744c1d0d3..d7d268d711 100644
Binary files a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/host-setup.png and b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/host-setup.png differ
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-done.png b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-done.png
index 316c16ad10..fcf94f1d51 100644
Binary files a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-done.png and b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-done.png differ
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-host-form.png b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-host-form.png
index 113fb415d6..3271f2e596 100644
Binary files a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-host-form.png and b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-host-form.png differ
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-mode.png b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-mode.png
index da213c51c2..4fce9690e6 100644
Binary files a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-mode.png and b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-mode.png differ
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-signin.png b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-signin.png
index d78ecdc8f3..ce46c34767 100644
Binary files a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-signin.png and b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/onboarding-signin.png differ
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/this-machine-unset.png b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/this-machine-unset.png
index 1ec507932d..2db7205b40 100644
Binary files a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/this-machine-unset.png and b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/Snapshots/this-machine-unset.png differ
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
index c445322631..1385ff9bb7 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
@@ -298,8 +298,11 @@ struct ViewModelTests {
await model.refresh()
let h = model.host
#expect(h.panel.actions.map(\.id) == [.setUp])
+ h.computerName = { "Ada’s MacBook Pro" }
await h.run(.setUp)
- #expect(h.formView?.title == "Set up this machine")
+ #expect(h.formView?.title == "Set up this computer")
+ // Name starts as what the system calls this computer.
+ #expect(h.formView?.fields.first?.value == "Ada’s MacBook Pro")
h.send(.setName(name: "Studio"))
await h.submit()
#expect(h.form == nil)
diff --git a/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift b/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift
index 75f45a6d8b..5324ef3e54 100644
--- a/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift
+++ b/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift
@@ -48,7 +48,7 @@ final class CuaSpacesMacUITests: XCTestCase {
XCTAssertTrue(app.staticTexts["Welcome to Cua Spaces"].waitForExistence(timeout: 10))
app.buttons["Get started"].click()
// First run no longer has a Command line page: Sign in follows Welcome.
- XCTAssertTrue(app.staticTexts["Sign in for account-based access to your machines and Spaces across devices; skip to continue without it."].waitForExistence(timeout: 5))
+ XCTAssertTrue(app.staticTexts["Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later."].waitForExistence(timeout: 5))
}
func testSpaceDetailShowsFactsAndTheDropWell() {
diff --git a/apps/cua-spaces-web/e2e/parity.spec.ts b/apps/cua-spaces-web/e2e/parity.spec.ts
index 871295ca91..9398720c0d 100644
--- a/apps/cua-spaces-web/e2e/parity.spec.ts
+++ b/apps/cua-spaces-web/e2e/parity.spec.ts
@@ -275,18 +275,19 @@ async function checkHostPanel(page: Page, cp: Of<"host-panel">): Promise<void> {
const readForm = (page: Page) =>
page.locator("[data-host-field]").evaluateAll((els) =>
els.map((el) => {
- const input = el.querySelector("input:not([type=hidden])") as HTMLInputElement | null;
+ const input = el.querySelector("input:not([type=hidden]):not([type=radio])") as HTMLInputElement | null;
const sw = el.querySelector('[role="switch"]');
+ const radios = el.querySelector('[role="radiogroup"]');
return {
id: el.getAttribute("data-host-field"),
- // A switch's state, a text field's text, or the pressed choice's label.
+ // A switch's state, a text field's text, or the checked choice's label.
value: sw
? sw.getAttribute("aria-checked") === "true"
? "on"
: "off"
- : input
- ? input.value
- : (el.querySelector('[aria-pressed="true"]')?.textContent ?? ""),
+ : radios
+ ? (radios.querySelector("input:checked")?.closest("label")?.textContent ?? "")
+ : (input?.value ?? ""),
invalid: input?.getAttribute("aria-invalid") === "true",
};
}),
diff --git a/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts
index bb646c96f8..de135c47f2 100644
--- a/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts
+++ b/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts
@@ -271,7 +271,7 @@ describe.skipIf(!wasmBuilt)("with the wasm core", () => {
const core = await testCore();
const guide = hostSetupGuide(core);
expect(guide.choices.map((c) => c.id)).toEqual(["desktop", "spare"]);
- expect(guide.intro).toMatch(/no port forwarding/);
+ expect(guide.intro).toMatch(/no network setup/);
expect(guide.form?.fields.map((f) => [f.id, f.advanced])).toEqual([
["name", false],
["profile", false],
diff --git a/apps/cua-spaces-web/src/bridge/__tests__/onboarding.test.tsx b/apps/cua-spaces-web/src/bridge/__tests__/onboarding.test.tsx
index 7636026285..2846a420f1 100644
--- a/apps/cua-spaces-web/src/bridge/__tests__/onboarding.test.tsx
+++ b/apps/cua-spaces-web/src/bridge/__tests__/onboarding.test.tsx
@@ -67,7 +67,7 @@ describe.each([
s = onboardingReduce(core, s, { type: "start" }, ctx);
expect(s.step).toBe("signin");
expect(onboardingView(core, s, "linux").canSkip).toBe(true);
- expect(onboardingView(core, s, "linux").lede).toBe("Sign in for account-based access to your machines and Spaces across devices; skip to continue without it.");
+ expect(onboardingView(core, s, "linux").lede).toBe("Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later.");
s = onboardingReduce(core, s, { type: "signin-done" }, ctx);
expect(s.step).toBe("agents");
s = onboardingReduce(core, s, { type: "agents-done", configured: ["Codex"] }, ctx);
diff --git a/apps/cua-spaces-web/src/bridge/adapters/demo-data.ts b/apps/cua-spaces-web/src/bridge/adapters/demo-data.ts
index f971066a87..b3ab5af87c 100644
--- a/apps/cua-spaces-web/src/bridge/adapters/demo-data.ts
+++ b/apps/cua-spaces-web/src/bridge/adapters/demo-data.ts
@@ -181,6 +181,8 @@ export function demoHostStatus(now = Date.now(), firstRun = false): HostStatus {
if (firstRun) {
return {
configured: false,
+ // What the system calls this computer: the setup form starts with it.
+ name: "Ada’s MacBook Pro",
sharing: false,
service: { installed: false, running: false, kind: "launchd" },
clients: [],
diff --git a/apps/cua-spaces-web/src/bridge/derive.ts b/apps/cua-spaces-web/src/bridge/derive.ts
index 561cea81b6..6b536b2755 100644
--- a/apps/cua-spaces-web/src/bridge/derive.ts
+++ b/apps/cua-spaces-web/src/bridge/derive.ts
@@ -533,7 +533,7 @@ function fallbackPanel(s: HostStatus | null): HostPanelView {
const base: HostPanelView = { title: "This machine", summary: "Checking…", configured: false, facts: [], clients: [], permissions: [], openSettingsLabel: "Open Settings", actions: [] };
if (!s) return base;
if (!s.configured) {
- return { ...base, summary: "Other devices can’t reach this machine yet.", intro: FALLBACK_INTRO, setupChoices: FALLBACK_CHOICES };
+ return { ...base, summary: "Your other devices can’t reach this computer yet.", intro: FALLBACK_INTRO, setupChoices: FALLBACK_CHOICES };
}
const via = s.mode === "direct" ? "Direct" : "Relay";
const summary = !s.service.running ? "Host service stopped" : !s.sharing ? "Not sharing" : `Sharing · ${via}`;
@@ -554,10 +554,10 @@ function fallbackPanel(s: HostStatus | null): HostPanelView {
}
const FALLBACK_INTRO =
- "This is the computer you are using now. Set it up for access to reach it and its Spaces from your other devices and your agents, over the Cua relay with no port forwarding.";
+ "This is the computer you’re using now. Set it up so you, your teammates and your AI agents can use it from other devices. Cua connects them for you, with no network setup.";
const FALLBACK_CHOICES: HostSetupChoice[] = [
- { id: "desktop", label: "Share this desktop", buttonLabel: "Set Up…" },
- { id: "spare", label: "Use as a spare machine for Spaces", buttonLabel: "Set Up…" },
+ { id: "desktop", label: "Use this computer from my other devices", buttonLabel: "Set Up…" },
+ { id: "spare", label: "Run Spaces here and keep its screen private", buttonLabel: "Set Up…" },
];
/** What "Add a machine" explains: the core's words for host setup, as the
diff --git a/apps/cua-spaces-web/src/bridge/onboarding.ts b/apps/cua-spaces-web/src/bridge/onboarding.ts
index 53f40ee374..b70579e1d5 100644
--- a/apps/cua-spaces-web/src/bridge/onboarding.ts
+++ b/apps/cua-spaces-web/src/bridge/onboarding.ts
@@ -232,12 +232,17 @@ function fallbackReduce(s: OnboardingFlowState, a: OnboardingAction): Onboarding
}
}
+/** How the copy names the computer the app runs on (the core's `this_computer`). */
+function thisComputer(os: HostOs): string {
+ return os === "macos" ? "this Mac" : os === "windows" ? "this PC" : "this computer";
+}
+
function fallbackView(s: OnboardingFlowState, os: HostOs): OnboardingView {
const pages: Partial<Record<OnboardingStep, [string, string, string]>> = {
welcome: ["Welcome to Cua Spaces", "Computers for you and your agents.", "Get started"],
- signin: ["Sign in", "Sign in for account-based access to your machines and Spaces across devices; skip to continue without it.", "Continue"],
+ signin: ["Sign in", "Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later.", "Continue"],
presentation: ["Where should Cua Spaces show up?", "You can change this in Settings.", "Continue"],
- mode: ["How will you use this machine?", "You can change this later.", "Continue"],
+ mode: [`How do you want to use ${thisComputer(os)}?`, "Use it only to open your other computers, or let your other devices reach it too. You can change this later.", "Continue"],
done: ["You're all set", os === "macos" ? "Cua Spaces is in your menu bar." : "Cua Spaces is in your system tray.", "Start using Cua Spaces"],
};
const [title, lede, primaryLabel] = pages[s.step] ?? ["", "", "Continue"];
@@ -259,14 +264,14 @@ function fallbackView(s: OnboardingFlowState, os: HostOs): OnboardingView {
{ label: "Account", value: s.identity ?? "not signed in" },
{ label: "AI agents", value: Array.isArray(s.agents) && s.agents.length ? s.agents.join(", ") : "none" },
{ label: "Shows in", value: s.menuBar ? "Menu bar only" : "Notch and menu bar" },
- { label: "This machine", value: s.mode === "host" ? "Set up for unattended access" : "Access other machines" },
+ { label: "This machine", value: s.mode === "host" ? "Reachable from your other devices" : "Only used to open other computers" },
]
: [],
choices:
s.step === "mode"
? [
- { mode: "client", label: "Access other machines", preselected: pre === "client" },
- { mode: "host", label: "Set up this machine for unattended access", preselected: pre === "host" },
+ { mode: "client", label: `Just use ${thisComputer(os)} to open my other computers`, preselected: pre === "client" },
+ { mode: "host", label: `Let my other devices reach ${thisComputer(os)}`, preselected: pre === "host" },
]
: [],
presentations:
diff --git a/apps/cua-spaces-web/src/bridge/this-machine.ts b/apps/cua-spaces-web/src/bridge/this-machine.ts
index 9ad07e126e..0b901f68f4 100644
--- a/apps/cua-spaces-web/src/bridge/this-machine.ts
+++ b/apps/cua-spaces-web/src/bridge/this-machine.ts
@@ -118,6 +118,15 @@ export class ThisMachineStore {
if (profile) form = hostFormReduce(this.core, form, { type: "set-profile", profile });
this.failedRequest = null;
this.set({ form, error: null, setupError: null });
+ void this.prefillName();
+ }
+
+ /** Fills Name with what the system calls this computer (the host reports
+ * it before setup), so nobody has to type it. A name already typed stays. */
+ private async prefillName(): Promise<void> {
+ const status = (await this.adapter.call("host.status", {}).catch(() => null)) as { name?: string | null } | null;
+ const name = status?.name?.trim();
+ if (name && this.state.form && !this.state.form.name) this.send({ type: "set-name", name });
}
closeForm(): void {
diff --git a/apps/cua-spaces-web/src/components/__tests__/onboarding-mode.test.tsx b/apps/cua-spaces-web/src/components/__tests__/onboarding-mode.test.tsx
index 4dcf375a65..34719fbe36 100644
--- a/apps/cua-spaces-web/src/components/__tests__/onboarding-mode.test.tsx
+++ b/apps/cua-spaces-web/src/components/__tests__/onboarding-mode.test.tsx
@@ -67,7 +67,7 @@ describe.skipIf(!wasmBuilt)("This machine in the first run", () => {
const hostChoice = await screen.findByTestId("onboarding-host");
expect(hostChoice).not.toHaveProperty("disabled", true);
expect(screen.queryByText(/Available once this machine is set up/)).toBeNull();
- expect(hostChoice.textContent).toMatch(/Next: name this machine/);
+ expect(hostChoice.textContent).toMatch(/Next: name it and choose who else can use it/);
// Choosing only selects; Continue opens the form.
fireEvent.click(hostChoice);
@@ -78,13 +78,15 @@ describe.skipIf(!wasmBuilt)("This machine in the first run", () => {
if (!f) throw new Error("no host form");
return f as HTMLFormElement;
});
+ // Name starts as what the system calls this computer.
+ await waitFor(() => expect(form.querySelector<HTMLInputElement>('[data-host-field="name"] input')?.value).toBe("Ada’s MacBook Pro"));
await waitFor(() => expect(form.querySelector<HTMLButtonElement>("[data-host-submit]")?.disabled).toBe(false));
fireEvent.submit(form);
await waitFor(() => expect(readSavedOnboarding().state?.step).toBe("done"), { timeout: 5000 });
expect(readSavedOnboarding().state?.mode).toBe("host");
});
- it("finishes the page at once for Access other machines", async () => {
+ it("finishes the page at once for the open-other-computers choice", async () => {
const adapter = createDemoAdapter({ latencyMs: 1, stepMs: 1, signedIn: true, onboarded: false });
render(
<BridgeProvider adapter={adapter} core={await testCore()} storeOptions={{ tickMs: 5 }}>
@@ -102,12 +104,12 @@ describe.skipIf(!wasmBuilt)("This machine in the first run", () => {
expect(readSavedOnboarding().state).toMatchObject({ step: "done", mode: "client" });
});
- it("always has an enabled Continue, with Access other machines selected, and Return continues", async () => {
+ it("always has an enabled Continue, with the open-other-computers choice selected, and Return continues", async () => {
await toMode();
const next = (await screen.findByRole("button", { name: /Continue/ })) as HTMLButtonElement;
expect(next.disabled).toBe(false);
- expect(screen.getByRole("radio", { name: /Access other machines/ }).getAttribute("aria-checked")).toBe("true");
- expect(screen.getByRole("radio", { name: /Set up this machine/ }).getAttribute("aria-checked")).toBe("false");
+ expect(screen.getByRole("radio", { name: /open my other computers/ }).getAttribute("aria-checked")).toBe("true");
+ expect(screen.getByRole("radio", { name: /Let my other devices reach/ }).getAttribute("aria-checked")).toBe("false");
fireEvent.keyDown(screen.getByTestId("heading"), { key: "Enter" });
expect(readSavedOnboarding().state).toMatchObject({ step: "done", mode: "client" });
});
diff --git a/apps/cua-spaces-web/src/components/onboarding-mode.tsx b/apps/cua-spaces-web/src/components/onboarding-mode.tsx
index 9b69c4b600..b920598568 100644
--- a/apps/cua-spaces-web/src/components/onboarding-mode.tsx
+++ b/apps/cua-spaces-web/src/components/onboarding-mode.tsx
@@ -88,7 +88,7 @@ export function ModeCard({ flow, view, host, choice }: { flow: OnboardingHook; v
>
<div className="text-[13px] font-semibold">{c.label}</div>
{setUp ? (
- <div className="mt-0.5 text-xs text-muted-foreground">Next: name this machine and choose who can reach it.</div>
+ <div className="mt-0.5 text-xs text-muted-foreground">Next: name it and choose who else can use it.</div>
) : null}
</button>
);
diff --git a/apps/cua-spaces-web/src/components/this-machine.tsx b/apps/cua-spaces-web/src/components/this-machine.tsx
index a65d43b242..151ccd90c0 100644
--- a/apps/cua-spaces-web/src/components/this-machine.tsx
+++ b/apps/cua-spaces-web/src/components/this-machine.tsx
@@ -21,7 +21,6 @@ import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { Dialog, DialogPopup, DialogTitle } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
-import { Segmented } from "@/components/ui/segmented";
import { Switch } from "@/components/ui/switch";
import { toast } from "@/components/ui/toast";
import { Tooltip } from "@/components/ui/tooltip";
@@ -311,15 +310,26 @@ export function HostSetupForm({
function Field({ field: f, host }: { field: HostFormView["fields"][number]; host: FormHost }) {
if (f.choices?.length) {
+ // Stacked radios, as the SwiftUI form: the options are whole sentences.
return (
- <Row label={f.label} data-host-field={f.id}>
- <Segmented
- aria-label={f.label}
- value={f.value}
- options={f.choices.map((c) => ({ value: c.id, label: c.label }))}
- onValueChange={(profile) => host.send({ type: "set-profile", profile })}
- />
- </Row>
+ <div data-host-field={f.id} className="px-4 py-2.5">
+ <div className="text-[13px]">{f.label}</div>
+ <div role="radiogroup" aria-label={f.label} className="mt-1.5 flex flex-col gap-1">
+ {f.choices.map((c) => (
+ <label key={c.id} className="flex cursor-default items-center gap-2 text-[13px]">
+ <input
+ type="radio"
+ name={`host-${f.id}`}
+ value={c.id}
+ checked={f.value === c.id}
+ onChange={() => host.send({ type: "set-profile", profile: c.id })}
+ className="accent-foreground"
+ />
+ {c.label}
+ </label>
+ ))}
+ </div>
+ </div>
);
}
if (f.toggle) {
diff --git a/apps/cua-spaces/src/components/InstallerFlow.test.tsx b/apps/cua-spaces/src/components/InstallerFlow.test.tsx
index 0a2804faf9..f656963db4 100644
--- a/apps/cua-spaces/src/components/InstallerFlow.test.tsx
+++ b/apps/cua-spaces/src/components/InstallerFlow.test.tsx
@@ -196,7 +196,7 @@ describe("InstallerFlow", () => {
click("Continue");
// Mode choice (§8.9), then done.
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
click("Continue");
expect(await screen.findByText("You're all set")).toBeInTheDocument();
expect(screen.getByText("/Users/ada/.local/bin/cua")).toBeInTheDocument();
@@ -270,7 +270,7 @@ describe("InstallerFlow", () => {
click("Continue");
await screen.findByRole("heading", { name: "Cua Volume" });
click("Continue");
- await screen.findByText("How will you use this machine?");
+ await screen.findByText("How do you want to use this Mac?");
click("Continue");
click(await screen.findByRole("button", { name: "Start using Cua Spaces" }).then((b) => b.textContent!));
expect(telemetry.signals).toEqual([]);
@@ -411,9 +411,9 @@ describe("InstallerFlow", () => {
onDone={onDone}
/>,
);
- click("Set up for access");
+ click("Turn on remote access");
expect(await screen.findByText("You're all set")).toBeInTheDocument();
- expect(screen.getByText("Set up for unattended access")).toBeInTheDocument();
+ expect(screen.getByText("Reachable from your other devices")).toBeInTheDocument();
expect(screen.queryByText("Grant in System Settings")).toBeNull();
click("Start using Cua Spaces");
expect(onDone).toHaveBeenCalledWith("host");
@@ -449,7 +449,7 @@ describe("InstallerFlow Cua Volume page", () => {
expect(within(card).getByText("Add Cua Volume to Finder")).toBeInTheDocument();
fireEvent.click(box());
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.calls.map((c) => [c.tool, c.args])).toEqual([
["volume_mount_status", {}],
["volume_storage", {}],
@@ -485,7 +485,7 @@ describe("InstallerFlow Cua Volume page", () => {
await waitFor(() => expect(asked()).toBeGreaterThan(before), { timeout: DRIVE_APPROVAL_POLL_MS + 1500 });
await waitFor(() => expect(screen.queryByRole("button", { name: "Open System Settings" })).toBeNull());
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.tools().filter((t) => t === "volume_mount")).toHaveLength(1);
});
@@ -507,7 +507,7 @@ describe("InstallerFlow Cua Volume page", () => {
// No storage answer: no choice to make.
expect(screen.queryByRole("radiogroup")).toBeNull();
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.tools()).toEqual(["volume_mount_status", "volume_storage"]);
});
@@ -548,7 +548,7 @@ describe("InstallerFlow Cua Volume page", () => {
await waitFor(() => expect(box()).toBeChecked());
fireEvent.click(box());
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(mounted.tools()).toEqual(["volume_mount_status", "volume_storage", "volume_unmount"]);
});
@@ -580,7 +580,7 @@ describe("InstallerFlow Cua Volume page", () => {
);
await waitFor(() => expect(document.querySelector('li[aria-label="Cua Volume"]')).toBeNull());
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
});
it("has no Volume page without the Cua Volume experiment, and mounts nothing", async () => {
@@ -598,7 +598,7 @@ describe("InstallerFlow Cua Volume page", () => {
);
await waitFor(() => expect(document.querySelector('li[aria-label="Cua Volume"]')).toBeNull());
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.tools()).not.toContain("volume_mount");
});
});
@@ -633,7 +633,7 @@ describe("InstallerFlow Cua Volume storage choice", () => {
await waitFor(() => expect(screen.getByRole("checkbox")).toBeEnabled());
fireEvent.click(screen.getByRole("checkbox"));
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.calls.map((c) => [c.tool, c.args])).toEqual([
["volume_mount_status", {}],
["volume_storage", {}],
@@ -673,7 +673,7 @@ describe("InstallerFlow Cua Volume storage choice", () => {
expect(tested).toBe(true);
expect(screen.getByRole("button", { name: "Continue" })).toBeEnabled();
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
const sets = drive.calls.filter((c) => c.tool === "volume_storage_set").map((c) => c.args);
const bucket = { endpoint: "http://127.0.0.1:9000", region: "us-east-1", bucket: "cua-volume", root: "", path_style: true };
const keys = { access_key_id: "maya-drive", secret_access_key: "fixture-secret" };
@@ -755,7 +755,7 @@ describe("InstallerFlow Cua Volume storage choice", () => {
const sets = drive.calls.filter((c) => c.tool === "volume_storage_set").map((c) => c.args);
expect(sets).toEqual([{ backend: "s3", s3: S3.s3, access_key_id: null, secret_access_key: null, dry_run: false }]);
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.tools().filter((t) => t === "volume_storage_set")).toHaveLength(1);
});
@@ -777,7 +777,7 @@ describe("InstallerFlow Cua Volume storage choice", () => {
expect(screen.getByText("Settings, Storage, any time.")).toHaveClass("st-note");
expect(screen.queryByRole("textbox")).toBeNull();
click("Continue");
- expect(await screen.findByText("How will you use this machine?")).toBeInTheDocument();
+ expect(await screen.findByText("How do you want to use this Mac?")).toBeInTheDocument();
expect(drive.tools()).toEqual(["volume_mount_status", "volume_storage"]);
});
});
@@ -795,7 +795,7 @@ describe("InstallerFlow on macOS", () => {
onDone={onDone}
/>,
);
- click("Set up for access");
+ click("Turn on remote access");
expect(await screen.findByText("Grant in System Settings")).toBeInTheDocument();
expect(screen.getByText("Screen Recording")).toBeInTheDocument();
expect(screen.getByText("Accessibility")).toBeInTheDocument();
@@ -887,7 +887,7 @@ describe("InstallerFlow launch at login", () => {
expect(readLaunchChoice()).toBe(true);
});
- it("is ticked after choosing 'Access other machines' and registers nothing until Start", async () => {
+ it("is ticked after choosing 'open my other computers' and registers nothing until Start", async () => {
const { fakeLoginItemBridge } = await import("../native/loginItem");
window.localStorage.clear();
const loginItem = fakeLoginItemBridge("notRegistered");
diff --git a/apps/cua-spaces/src/components/Onboarding.test.tsx b/apps/cua-spaces/src/components/Onboarding.test.tsx
index 805e960084..358a03f7df 100644
--- a/apps/cua-spaces/src/components/Onboarding.test.tsx
+++ b/apps/cua-spaces/src/components/Onboarding.test.tsx
@@ -8,27 +8,27 @@ import { createFakeHostBridge } from "../native/host";
import { Onboarding } from "./Onboarding";
describe("Onboarding", () => {
- it("offers both choices; 'Access other machines' installs nothing", async () => {
+ it("offers both choices; 'open my other computers' installs nothing", async () => {
const host = createFakeHostBridge();
const onDone = vi.fn();
render(<Onboarding host={host} onDone={onDone} />);
- expect(screen.getByText("Set up this machine for unattended access")).toBeInTheDocument();
+ expect(screen.getByText("Let my other devices reach this Mac")).toBeInTheDocument();
fireEvent.click(screen.getByRole("button", { name: "Continue" }));
await waitFor(() => expect(onDone).toHaveBeenCalledWith("client", undefined));
expect(host.calls).toEqual(["onboarding:client"]);
});
- it("always shows an enabled Continue with 'Access other machines' selected, and Enter continues", async () => {
+ it("always shows an enabled Continue with 'open my other computers' selected, and Enter continues", async () => {
const host = createFakeHostBridge();
const onDone = vi.fn();
render(<Onboarding host={host} onDone={onDone} />);
expect(screen.getByRole("button", { name: "Continue" })).toBeEnabled();
- expect(screen.getByRole("radio", { name: "Access other machines" })).toHaveAttribute("aria-checked", "true");
+ expect(screen.getByRole("radio", { name: "Just use this Mac to open my other computers" })).toHaveAttribute("aria-checked", "true");
expect(screen.getByTestId("mode-later")).toHaveTextContent("This machine");
// Choosing a card only selects it.
- fireEvent.click(screen.getByRole("radio", { name: "Set up this machine for unattended access" }));
+ fireEvent.click(screen.getByRole("radio", { name: "Let my other devices reach this Mac" }));
expect(onDone).not.toHaveBeenCalled();
- fireEvent.click(screen.getByRole("radio", { name: "Access other machines" }));
+ fireEvent.click(screen.getByRole("radio", { name: "Just use this Mac to open my other computers" }));
fireEvent.keyDown(document.body, { key: "Enter" });
await waitFor(() => expect(onDone).toHaveBeenCalledWith("client", undefined));
});
@@ -37,12 +37,12 @@ describe("Onboarding", () => {
const host = createFakeHostBridge({ platform: "linux" });
const onDone = vi.fn();
render(<Onboarding host={host} onDone={onDone} identity="[email protected]" />);
- fireEvent.click(screen.getByText("Set up this machine for unattended access"));
+ fireEvent.click(screen.getByText("Let my other devices reach this Mac"));
fireEvent.click(screen.getByRole("button", { name: "Continue" }));
- expect(screen.getByText("Joins the Cua relay as [email protected]. No port forwarding.")).toBeInTheDocument();
+ expect(screen.getByText("You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].")).toBeInTheDocument();
// Direct ip:port is hidden until Advanced is opened.
expect(screen.queryByText(/Direct connection/)).toBeNull();
- fireEvent.click(screen.getByRole("button", { name: "Set up for access" }));
+ fireEvent.click(screen.getByRole("button", { name: "Turn on remote access" }));
await waitFor(() => expect(onDone).toHaveBeenCalledWith("host", expect.objectContaining({ configured: true })));
expect(host.calls).toEqual(["setup:relay:https://relay.cua.ai", "onboarding:host"]);
});
@@ -51,15 +51,15 @@ describe("Onboarding", () => {
const host = createFakeHostBridge({ platform: "linux" });
const onDone = vi.fn();
render(<Onboarding host={host} onDone={onDone} />);
- fireEvent.click(screen.getByText("Set up this machine for unattended access"));
+ fireEvent.click(screen.getByText("Let my other devices reach this Mac"));
fireEvent.click(screen.getByRole("button", { name: "Continue" }));
fireEvent.click(screen.getByRole("button", { name: "Advanced" }));
fireEvent.click(screen.getByLabelText(/Direct connection/));
const listen = screen.getByDisplayValue("0.0.0.0:3211");
fireEvent.change(listen, { target: { value: "not an address" } });
- expect(screen.getByRole("button", { name: "Set up for access" })).toBeDisabled();
+ expect(screen.getByRole("button", { name: "Turn on remote access" })).toBeDisabled();
fireEvent.change(listen, { target: { value: "192.168.1.20:3211" } });
- fireEvent.click(screen.getByRole("button", { name: "Set up for access" }));
+ fireEvent.click(screen.getByRole("button", { name: "Turn on remote access" }));
await waitFor(() => expect(onDone).toHaveBeenCalledWith("host", expect.anything()));
expect(host.calls[0]).toBe("setup:direct:192.168.1.20:3211");
});
@@ -69,7 +69,7 @@ describe("Onboarding", () => {
const onDone = vi.fn();
render(<Onboarding host={host} onDone={onDone} installerMode="host" />);
// Installer preselected host mode: straight to the form.
- fireEvent.click(screen.getByRole("button", { name: "Set up for access" }));
+ fireEvent.click(screen.getByRole("button", { name: "Turn on remote access" }));
expect(await screen.findByRole("alert")).toHaveTextContent("sign in to Cua first");
expect(onDone).not.toHaveBeenCalled();
});
diff --git a/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx b/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx
index 3d136a7849..569c3da6bb 100644
--- a/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx
+++ b/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx
@@ -92,12 +92,12 @@ describe("host model", () => {
});
describe("ThisMachinePanel", () => {
- it("unconfigured: offers Set up for access and runs the host flow", async () => {
+ it("unconfigured: offers Turn on remote access and runs the host flow", async () => {
const host = createFakeHostBridge({ platform: "linux" });
const onStatus = vi.fn();
render(<ThisMachinePanel host={host} onStatus={onStatus} />);
- fireEvent.click(await screen.findByRole("button", { name: "Set up for access" }));
- fireEvent.click(screen.getByRole("button", { name: "Set up for access" }));
+ fireEvent.click(await screen.findByRole("button", { name: "Turn on remote access" }));
+ fireEvent.click(screen.getByRole("button", { name: "Turn on remote access" }));
expect(await screen.findByRole("button", { name: "Stop sharing" })).toBeInTheDocument();
expect(host.calls).toEqual(["setup:relay:https://relay.cua.ai"]);
expect(onStatus).toHaveBeenLastCalledWith(expect.objectContaining({ configured: true, sharing: true }));
@@ -127,7 +127,7 @@ describe("ThisMachinePanel", () => {
name: "Remove",
}),
);
- expect(await screen.findByRole("button", { name: "Set up for access" })).toBeInTheDocument();
+ expect(await screen.findByRole("button", { name: "Turn on remote access" })).toBeInTheDocument();
expect(host.calls).toEqual(["stop", "start", "remove"]);
});
@@ -156,10 +156,10 @@ describe("ThisMachinePanel: a spare machine", () => {
it("sets up a spare machine: desktop private, Spaces on, limits shown", async () => {
const host = createFakeHostBridge({ platform: "macos" });
render(<ThisMachinePanel host={host} />);
- fireEvent.click(await screen.findByRole("button", { name: "Set up for access" }));
- fireEvent.click(screen.getByRole("radio", { name: "A spare machine for Spaces" }));
- expect(screen.getByText(/its desktop stays private/)).toBeInTheDocument();
- fireEvent.click(screen.getByRole("button", { name: "Set up for access" }));
+ fireEvent.click(await screen.findByRole("button", { name: "Turn on remote access" }));
+ fireEvent.click(screen.getByRole("radio", { name: "Run Spaces here and keep its screen private" }));
+ expect(screen.getByText(/Its own screen stays private/)).toBeInTheDocument();
+ fireEvent.click(screen.getByRole("button", { name: "Start running Spaces" }));
const desktop = await screen.findByRole("switch", { name: /Share this desktop/ });
expect(desktop).not.toBeChecked();
expect(screen.getByRole("switch", { name: /Provide Spaces/ })).toBeChecked();
diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
index 4fd896227d..0fca738d9d 100644
--- a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
+++ b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
@@ -62,7 +62,7 @@ describe("MainWindow", () => {
fireEvent.click(await screen.findByRole("button", { name: "Continue" }));
// No Cua Volume page without its experiment (Settings, Experiments).
expect(screen.queryByRole("heading", { name: "Cua Volume" })).toBeNull();
- await screen.findByText("Access other machines");
+ await screen.findByText("Just use this Mac to open my other computers");
fireEvent.click(screen.getByRole("button", { name: "Continue" }));
fireEvent.click(await screen.findByRole("button", { name: "Start using Cua Spaces" }));
expect(await screen.findByRole("listbox", { name: "Cua Cloud" })).toBeInTheDocument();
@@ -389,9 +389,9 @@ describe("MainWindow", () => {
"Teleport",
]);
fireEvent.click(within(screen.getByRole("listbox", { name: "This machine" })).getByRole("option"));
- fireEvent.click(await screen.findByRole("button", { name: "Set up for access" }));
- expect(await screen.findByText("Set up this machine")).toBeInTheDocument();
- fireEvent.click(screen.getByRole("button", { name: "Set up for access" }));
+ fireEvent.click(await screen.findByRole("button", { name: "Turn on remote access" }));
+ expect(await screen.findByText("Set up this computer")).toBeInTheDocument();
+ fireEvent.click(screen.getByRole("button", { name: "Turn on remote access" }));
expect(await screen.findByRole("button", { name: "Stop sharing" })).toBeInTheDocument();
await waitFor(() =>
expect(within(screen.getByRole("listbox", { name: "This machine" })).getByRole("option")).toHaveAttribute(
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/drive-onboarding.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/drive-onboarding.json
index dbae8dfcfb..2797a5bc78 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/drive-onboarding.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/drive-onboarding.json
@@ -166,13 +166,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -181,7 +181,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -216,7 +216,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: Waiting for approval",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -306,13 +306,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -321,7 +321,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -356,7 +356,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: /home/maya/Cua Volume",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -421,13 +421,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -436,7 +436,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -477,13 +477,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -492,7 +492,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -554,7 +554,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -599,13 +599,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -614,7 +614,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -945,13 +945,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -960,7 +960,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -1099,13 +1099,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -1114,7 +1114,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
@@ -1156,13 +1156,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines (preselected)",
- "host: Set up this machine for unattended access"
+ "client: Just use this Mac to open my other computers (preselected)",
+ "host: Let my other devices reach this Mac"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -1171,7 +1171,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"request": null,
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json
index f8a3ee0d2e..b40091a1c0 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json
@@ -44,7 +44,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -152,7 +152,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: In Finder",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -279,7 +279,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: In Finder",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -410,7 +410,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: In Finder",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -527,7 +527,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: In Finder",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -644,7 +644,7 @@
"AI agents: none",
"Shows in: Notch and menu bar",
"Cua Volume: In Finder",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -759,7 +759,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -881,7 +881,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -998,7 +998,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -1113,7 +1113,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -1230,7 +1230,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/launch-at-login.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/launch-at-login.json
index 07490bfc50..60fb3084b1 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/launch-at-login.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/launch-at-login.json
@@ -27,7 +27,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -61,7 +61,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -95,7 +95,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Access other machines"
+ "This machine: Only used to open other computers"
],
"title": "You're all set",
"usage": null
@@ -129,7 +129,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Set up for unattended access"
+ "This machine: Reachable from your other devices"
],
"title": "You're all set",
"usage": null
@@ -163,7 +163,7 @@
"Account: not signed in",
"AI agents: none",
"Shows in: Notch and menu bar",
- "This machine: Set up for unattended access"
+ "This machine: Reachable from your other devices"
],
"title": "You're all set",
"usage": null
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json
index 1c637ebef1..b1086be818 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json
@@ -34,14 +34,14 @@
"host": false,
"panel": {
"actions": [
- "set-up: Set up for access"
+ "set-up: Turn on remote access"
],
"clients": null,
"configured": false,
"facts": [],
"openSettings": "Open Settings",
"permissions": [],
- "summary": "Other devices can’t reach this machine yet.",
+ "summary": "Your other devices can’t reach this computer yet.",
"title": "This machine"
},
"sidebar": {
@@ -316,17 +316,17 @@
"frame": {
"advanced": "Advanced",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = "
+ "name: Name [How it shows on your other devices] = ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = "
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.cua.ai direct=- name=- allow=-",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "initial"
},
@@ -334,17 +334,17 @@
"frame": {
"advanced": "Advanced",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = "
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = "
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.cua.ai direct=- name=Studio allow=-",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-name"
},
@@ -352,17 +352,17 @@
"frame": {
"advanced": "Advanced",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]"
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.cua.ai direct=- name=Studio [email protected],[email protected]",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-allow"
},
@@ -370,19 +370,19 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]",
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]",
"direct: Direct connection = off (advanced)",
- "relay: Relay [https://relay.cua.ai] = https://relay.cua.ai (advanced)"
+ "relay: Relay server [https://relay.cua.ai] = https://relay.cua.ai (advanced)"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.cua.ai direct=- name=Studio [email protected],[email protected]",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "toggle-advanced"
},
@@ -390,19 +390,19 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": false,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]",
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]",
"direct: Direct connection = off (advanced)",
- "relay: Relay [https://relay.cua.ai] = ftp://relay !invalid (advanced)"
+ "relay: Relay server [https://relay.cua.ai] = ftp://relay !invalid (advanced)"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": null,
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-relay-url"
},
@@ -410,19 +410,19 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]",
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]",
"direct: Direct connection = off (advanced)",
- "relay: Relay [https://relay.cua.ai] = https://relay.example/ (advanced)"
+ "relay: Relay server [https://relay.cua.ai] = https://relay.example/ (advanced)"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.example direct=- name=Studio [email protected],[email protected]",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-relay-url"
},
@@ -430,17 +430,17 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
+ "name: Name [How it shows on your other devices] = Studio ",
"direct: Direct connection = on (advanced)",
"listen: Listen on [0.0.0.0:3211] = 0.0.0.0:3211 (advanced)"
],
- "lede": "Other machines connect to this address with an access token.",
+ "lede": "Other computers on your network connect to this address with an access token.",
"request": "mode=direct relay=- direct=0.0.0.0:3211 name=Studio allow=-",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-direct"
},
@@ -448,17 +448,17 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": false,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
+ "name: Name [How it shows on your other devices] = Studio ",
"direct: Direct connection = on (advanced)",
"listen: Listen on [0.0.0.0:3211] = somewhere !invalid (advanced)"
],
- "lede": "Other machines connect to this address with an access token.",
+ "lede": "Other computers on your network connect to this address with an access token.",
"request": null,
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-listen"
},
@@ -466,17 +466,17 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
+ "name: Name [How it shows on your other devices] = Studio ",
"direct: Direct connection = on (advanced)",
"listen: Listen on [0.0.0.0:3211] = 0.0.0.0:3300 (advanced)"
],
- "lede": "Other machines connect to this address with an access token.",
+ "lede": "Other computers on your network connect to this address with an access token.",
"request": "mode=direct relay=- direct=0.0.0.0:3300 name=Studio allow=-",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-listen"
},
@@ -488,13 +488,13 @@
"canSubmit": false,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
+ "name: Name [How it shows on your other devices] = Studio ",
"direct: Direct connection = on (advanced)",
"listen: Listen on [0.0.0.0:3211] = 0.0.0.0:3300 (advanced)"
],
- "lede": "Other machines connect to this address with an access token.",
+ "lede": "Other computers on your network connect to this address with an access token.",
"request": "mode=direct relay=- direct=0.0.0.0:3300 name=Studio allow=-",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "submit"
},
@@ -502,17 +502,17 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": "launchctl bootstrap failed",
"fields": [
- "name: Name [This computer’s name] = Studio ",
+ "name: Name [How it shows on your other devices] = Studio ",
"direct: Direct connection = on (advanced)",
"listen: Listen on [0.0.0.0:3211] = 0.0.0.0:3300 (advanced)"
],
- "lede": "Other machines connect to this address with an access token.",
+ "lede": "Other computers on your network connect to this address with an access token.",
"request": "mode=direct relay=- direct=0.0.0.0:3300 name=Studio allow=-",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "failed"
},
@@ -520,19 +520,19 @@
"frame": {
"advanced": "Advanced (open)",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": "launchctl bootstrap failed",
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]",
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]",
"direct: Direct connection = off (advanced)",
- "relay: Relay [https://relay.cua.ai] = https://relay.example/ (advanced)"
+ "relay: Relay server [https://relay.cua.ai] = https://relay.example/ (advanced)"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.example direct=- name=Studio [email protected],[email protected]",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "set-direct"
},
@@ -540,17 +540,17 @@
"frame": {
"advanced": "Advanced",
"busy": false,
- "buttons": "Back / Set up for access",
+ "buttons": "Back / Turn on remote access",
"canSubmit": true,
"error": "launchctl bootstrap failed",
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]"
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.example direct=- name=Studio [email protected],[email protected]",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "toggle-advanced"
},
@@ -562,13 +562,13 @@
"canSubmit": false,
"error": null,
"fields": [
- "name: Name [This computer’s name] = Studio ",
- "profile: Use for [-] = desktop",
- "allow: Also allow [Emails, optional] = [email protected], [email protected]"
+ "name: Name [How it shows on your other devices] = Studio ",
+ "profile: Use it to [-] = desktop",
+ "allow: Share with (optional) [Teammates’ emails] = [email protected], [email protected]"
],
- "lede": "Joins the Cua relay as [email protected]. No port forwarding.",
+ "lede": "You and the people you share with can see and use this computer’s screen from other devices. Cua connects them for you, with no network setup. Signed in as [email protected].",
"request": "mode=relay relay=https://relay.example direct=- name=Studio [email protected],[email protected]",
- "title": "Set up this machine"
+ "title": "Set up this computer"
},
"hostForm": "submit"
},
@@ -799,7 +799,7 @@
"dots": "Welcome,*Sign in,AI agents,Menu bar,This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "Sign in for account-based access to your machines and Spaces across devices; skip to continue without it.",
+ "lede": "Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -821,7 +821,7 @@
"dots": "Welcome,*Sign in,AI agents,Menu bar,This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "Sign in for account-based access to your machines and Spaces across devices; skip to continue without it.",
+ "lede": "Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -1009,13 +1009,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines",
- "host: Set up this machine for unattended access (preselected)"
+ "client: Just use this Mac to open my other computers",
+ "host: Let my other devices reach this Mac (preselected)"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -1024,7 +1024,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"onboarding": "presentation-done"
@@ -1059,13 +1059,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines",
- "host: Set up this machine for unattended access (preselected)"
+ "client: Just use this Mac to open my other computers",
+ "host: Let my other devices reach this Mac (preselected)"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -1074,7 +1074,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"onboarding": "presentation-done"
@@ -1084,13 +1084,13 @@
"canBack": true,
"canSkip": false,
"choices": [
- "client: Access other machines",
- "host: Set up this machine for unattended access (preselected)"
+ "client: Just use this Mac to open my other computers",
+ "host: Let my other devices reach this Mac (preselected)"
],
"dots": "Welcome,Sign in,AI agents,Menu bar,*This machine,Done",
"drive": null,
"driveStorage": null,
- "lede": "You can change this later.",
+ "lede": "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"notice": null,
"noticeLink": null,
"presentations": [],
@@ -1099,7 +1099,7 @@
"showMark": false,
"step": "mode",
"summary": [],
- "title": "How will you use this machine?",
+ "title": "How do you want to use this Mac?",
"usage": null
},
"onboarding": "drive-continue"
@@ -1130,7 +1130,7 @@
"Account: [email protected]",
"AI agents: Codex",
"Shows in: Menu bar only",
- "This machine: Set up for unattended access"
+ "This machine: Reachable from your other devices"
],
"title": "You're all set",
"usage": null
diff --git a/libs/cua/crates/cua-spaces-app-core/src/host.rs b/libs/cua/crates/cua-spaces-app-core/src/host.rs
index e4472094bb..f362c37669 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/host.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/host.rs
@@ -1025,21 +1025,30 @@ pub struct HostSetupChoice {
}
/// The intro over the setup choices.
-pub const HOST_INTRO: &str = "This is the computer you are using now. Set it \
-up for access to reach it and its Spaces from your other devices and your \
-agents, over the Cua relay with no port forwarding.";
+pub const HOST_INTRO: &str = "This is the computer you\u{2019}re using now. Set \
+it up so you, your teammates and your AI agents can use it from other devices. \
+Cua connects them for you, with no network setup.";
+
+/// The "Use it to" option that shares this computer's screen.
+pub const DESKTOP_CHOICE: &str = "Use this computer from my other devices";
+/// The "Use it to" option for a spare computer that only runs Spaces.
+pub const SPARE_CHOICE: &str = "Run Spaces here and keep its screen private";
+/// The button that sets this computer up (shares its screen).
+pub const SET_UP_LABEL: &str = "Turn on remote access";
+/// The form's button for a spare computer.
+pub const SPARE_SUBMIT: &str = "Start running Spaces";
/// The setup choices (the form's "Use for" options).
pub fn setup_choices() -> Vec<HostSetupChoice> {
vec![
HostSetupChoice {
id: "desktop".into(),
- label: "Share this desktop".into(),
+ label: DESKTOP_CHOICE.into(),
button_label: "Set Up\u{2026}".into(),
},
HostSetupChoice {
id: "spare".into(),
- label: "Use as a spare machine for Spaces".into(),
+ label: SPARE_CHOICE.into(),
button_label: "Set Up\u{2026}".into(),
},
]
@@ -1104,12 +1113,12 @@ pub fn panel(state: Option<&HostState>) -> HostPanelView {
return v;
};
if !s.configured {
- v.summary = "Other devices can\u{2019}t reach this machine yet.".into();
+ v.summary = "Your other devices can\u{2019}t reach this computer yet.".into();
v.intro = Some(HOST_INTRO.into());
v.setup_choices = setup_choices();
v.actions = vec![HostAction {
id: HostActionId::SetUp,
- label: "Set up for access".into(),
+ label: SET_UP_LABEL.into(),
destructive: false,
confirm: None,
enabled: true,
@@ -1678,7 +1687,7 @@ pub fn form_view(s: &HostFormState, identity: Option<&str>) -> HostFormView {
let mut fields = vec![text(
"name",
"Name",
- "This computer\u{2019}s name",
+ "How it shows on your other devices",
&s.name,
false,
false,
@@ -1686,7 +1695,7 @@ pub fn form_view(s: &HostFormState, identity: Option<&str>) -> HostFormView {
if !s.direct {
fields.push(HostFormField {
id: "profile".into(),
- label: "Use for".into(),
+ label: "Use it to".into(),
placeholder: None,
value: if s.spare { "spare" } else { "desktop" }.into(),
toggle: false,
@@ -1696,18 +1705,18 @@ pub fn form_view(s: &HostFormState, identity: Option<&str>) -> HostFormView {
choices: vec![
HostFormChoice {
id: "desktop".into(),
- label: "Its desktop".into(),
+ label: DESKTOP_CHOICE.into(),
},
HostFormChoice {
id: "spare".into(),
- label: "A spare machine for Spaces".into(),
+ label: SPARE_CHOICE.into(),
},
],
});
fields.push(text(
"allow",
- "Also allow",
- "Emails, optional",
+ "Share with (optional)",
+ "Teammates\u{2019} emails",
&s.allow,
false,
false,
@@ -1739,7 +1748,7 @@ pub fn form_view(s: &HostFormState, identity: Option<&str>) -> HostFormView {
let bad = !s.relay_url.trim().is_empty() && form_request(s).is_err();
fields.push(text(
"relay",
- "Relay",
+ "Relay server",
&default_relay_url(),
&s.relay_url,
bad,
@@ -1748,21 +1757,21 @@ pub fn form_view(s: &HostFormState, identity: Option<&str>) -> HostFormView {
}
}
let lede = if s.direct {
- "Other machines connect to this address with an access token.".to_string()
+ "Other computers on your network connect to this address with an access token.".to_string()
} else {
let what = if s.spare {
- " Runs Spaces for your devices; its desktop stays private."
+ "This computer runs Spaces, separate computers inside it, that you and your team open from other devices. Its own screen stays private."
} else {
- ""
+ "You and the people you share with can see and use this computer\u{2019}s screen from other devices. Cua connects them for you, with no network setup."
};
match identity.filter(|i| !i.is_empty()) {
- Some(id) => format!("Joins the Cua relay as {id}. No port forwarding.{what}"),
- None => format!("Joins the Cua relay. No port forwarding.{what}"),
+ Some(id) => format!("{what} Signed in as {id}."),
+ None => what.to_string(),
}
};
let request = form_request(s).ok();
HostFormView {
- title: "Set up this machine".into(),
+ title: "Set up this computer".into(),
lede,
fields,
advanced_label: "Advanced".into(),
@@ -1770,8 +1779,10 @@ pub fn form_view(s: &HostFormState, identity: Option<&str>) -> HostFormView {
back_label: "Back".into(),
submit_label: if s.busy {
"Setting up\u{2026}"
+ } else if s.spare && !s.direct {
+ SPARE_SUBMIT
} else {
- "Set up for access"
+ SET_UP_LABEL
}
.into(),
can_submit: request.is_some() && !s.busy,
@@ -2523,9 +2534,27 @@ mod tests {
.iter()
.map(|c| c.label.as_str())
.collect::<Vec<_>>(),
- ["Its desktop", "A spare machine for Spaces"]
+ [DESKTOP_CHOICE, SPARE_CHOICE]
+ );
+ assert!(
+ v.lede.contains("Its own screen stays private"),
+ "{}",
+ v.lede
);
- assert!(v.lede.contains("its desktop stays private"), "{}", v.lede);
+ assert!(
+ v.lede.ends_with("Signed in as [email protected]."),
+ "{}",
+ v.lede
+ );
+ assert_eq!(v.submit_label, SPARE_SUBMIT);
+ // The desktop choice: plain words, an everyday button, no jargon.
+ let desk = form_view(&form_initial(), None);
+ assert_eq!(desk.submit_label, SET_UP_LABEL);
+ for word in ["relay", "port forwarding", "host"] {
+ assert!(!desk.lede.to_lowercase().contains(word), "{}", desk.lede);
+ }
+ let allow = desk.fields.iter().find(|f| f.id == "allow").unwrap();
+ assert_eq!(allow.label, "Share with (optional)");
let request = v.request.unwrap();
assert_eq!(request.profile.as_deref(), Some("spare"));
assert_eq!(request.settings(), (false, true));
diff --git a/libs/cua/crates/cua-spaces-app-core/src/onboarding.rs b/libs/cua/crates/cua-spaces-app-core/src/onboarding.rs
index b78eb5e491..b3e9eafdc6 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/onboarding.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/onboarding.rs
@@ -1135,6 +1135,15 @@ fn cli_lede(plan: &CliInstallPlan) -> String {
}
}
+/// How the copy names the computer the app runs on.
+fn this_computer(os: SpaceOs) -> &'static str {
+ match os {
+ SpaceOs::Macos => "this Mac",
+ SpaceOs::Windows => "this PC",
+ _ => "this computer",
+ }
+}
+
/// The flow as drawn, in a Mac's words.
pub fn view(s: &OnboardingState) -> OnboardingView {
view_on(s, SpaceOs::Macos)
@@ -1154,6 +1163,8 @@ pub fn view_on(s: &OnboardingState, os: SpaceOs) -> OnboardingView {
use crate::spaces::sidebar::Fact;
use OnboardingStep::*;
let cli = s.cli_plan.as_ref().map(cli_lede).unwrap_or_default();
+ let here = this_computer(os);
+ let mode_title = format!("How do you want to use {here}?");
let (title, lede, primary) = match s.step {
Welcome => (
"Welcome to Cua Spaces",
@@ -1180,7 +1191,7 @@ pub fn view_on(s: &OnboardingState, os: SpaceOs) -> OnboardingView {
),
Signin => (
"Sign in",
- "Sign in for account-based access to your machines and Spaces across devices; skip to continue without it.",
+ "Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later.",
"Continue",
),
Agents => (
@@ -1200,8 +1211,8 @@ pub fn view_on(s: &OnboardingState, os: SpaceOs) -> OnboardingView {
},
),
Mode => (
- "How will you use this machine?",
- "You can change this later.",
+ mode_title.as_str(),
+ "Use it only to open your other computers, or let your other devices reach it too. You can change this later.",
"Continue",
),
Done => ("You're all set", done_lede(os), "Start using Cua Spaces"),
@@ -1251,9 +1262,9 @@ pub fn view_on(s: &OnboardingState, os: SpaceOs) -> OnboardingView {
Fact {
label: "This machine".into(),
value: if s.mode == Some(OnboardingMode::Host) {
- "Set up for unattended access"
+ "Reachable from your other devices"
} else {
- "Access other machines"
+ "Only used to open other computers"
}
.into(),
copy: None,
@@ -1300,16 +1311,19 @@ pub fn view_on(s: &OnboardingState, os: SpaceOs) -> OnboardingView {
choices: if s.step == Mode {
let pre = s.installer_mode.unwrap_or(OnboardingMode::Client);
[
- (OnboardingMode::Client, "Access other machines"),
+ (
+ OnboardingMode::Client,
+ format!("Just use {here} to open my other computers"),
+ ),
(
OnboardingMode::Host,
- "Set up this machine for unattended access",
+ format!("Let my other devices reach {here}"),
),
]
.into_iter()
.map(|(mode, label)| ModeChoice {
mode,
- label: label.into(),
+ label,
preselected: mode == pre,
})
.collect()
@@ -1389,6 +1403,30 @@ mod tests {
}
}
+ #[test]
+ fn the_mode_step_names_the_computer_in_everyday_words() {
+ let mut s = reduce(&initial(None, None), &OnboardingAction::Start);
+ s.step = OnboardingStep::Mode;
+ let mac = view_on(&s, SpaceOs::Macos);
+ assert_eq!(mac.title, "How do you want to use this Mac?");
+ let labels: Vec<_> = mac.choices.iter().map(|c| c.label.as_str()).collect();
+ assert_eq!(
+ labels,
+ [
+ "Just use this Mac to open my other computers",
+ "Let my other devices reach this Mac"
+ ]
+ );
+ assert_eq!(
+ view_on(&s, SpaceOs::Windows).title,
+ "How do you want to use this PC?"
+ );
+ assert_eq!(
+ view_on(&s, SpaceOs::Linux).title,
+ "How do you want to use this computer?"
+ );
+ }
+
#[test]
fn signin_explains_account_access_and_allows_skipping() {
let s = reduce(&initial(None, None), &OnboardingAction::Start);
@@ -1397,7 +1435,7 @@ mod tests {
assert_eq!(v.title, "Sign in");
assert_eq!(
v.lede,
- "Sign in for account-based access to your machines and Spaces across devices; skip to continue without it."
+ "Sign in to reach your computers and Spaces from any of your devices. You can skip this and sign in later."
);
assert!(v.can_skip);
}