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): rc.2 smoke fixes: Continue on This machine, example prompts, update defaults, plain errors (CUA-1816) (#5367)

Francesco Bonacci9fd19f31db4d
diff --git a/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi.ts b/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi.ts
index e40313b054..65cfc73d20 100644
--- a/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi.ts
+++ b/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi.ts
@@ -6540,7 +6540,7 @@ const FfiConverterTypeAppSettingsOption = (() => {
export type AppAboutUpdates = {
/**
- * "Automatically check for updates".
+ * "Check for and download updates automatically".
*/
autoCheckLabel: string,
/**
@@ -6548,7 +6548,7 @@ export type AppAboutUpdates = {
*/
autoCheck: boolean,
/**
- * "Install updates automatically".
+ * "Install a downloaded update when Cua Spaces quits".
*/
autoInstallLabel: string,
/**
diff --git a/apps/cua-spaces-macos/README.md b/apps/cua-spaces-macos/README.md
index 79dcb53b99..0f6ceb22ab 100644
--- a/apps/cua-spaces-macos/README.md
+++ b/apps/cua-spaces-macos/README.md
@@ -346,11 +346,13 @@ unpacked (Sparkle does this whatever the user driver).
Sparkle shows no window of its own. `SparkleUpdater` runs an `SPUUpdater`
with a custom user driver (`UpdateUserDriver`, over the plain-value
`UpdateFlow` state machine in `UpdateDriver.swift`). It checks at launch and
-periodically (`SUEnableAutomaticChecks` is on; an explicit off is kept). An
+periodically (`SUEnableAutomaticChecks` and `SUAutomaticallyUpdate` are on, so
+updates check and download in the background out of the box, as on Windows
+and Linux; an explicit off is kept). An
update found by a scheduled check downloads and extracts at once; Sparkle's
ready-to-install reply is then held, and nothing restarts the app until the
-page calls `update.install` ("Restart to update"). With "install updates
-automatically" on, Sparkle's silent path reaches the same state through
+page calls `update.install` ("Restart to update"). With "check for and
+download updates automatically" on (the default), Sparkle's silent path reaches the same state through
`updater(_:willInstallUpdateOnQuit:immediateInstallationBlock:)`. The page
reads the state with `update.get` (`{status, currentVersion, version,
percent, notesUrl, message}`; status is `idle`, `checking`, `available`,
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/UpdateDriver.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/UpdateDriver.swift
index 7fe74e2380..e7fe886114 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/UpdateDriver.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/UpdateDriver.swift
@@ -241,9 +241,11 @@ public final class UpdateUserDriver: NSObject, SPUUserDriver {
// MARK: - SPUUserDriver
public func show(_ request: SPUUpdatePermissionRequest, reply: @escaping (SUUpdatePermissionResponse) -> Void) {
- // Checking is on by default (SUEnableAutomaticChecks); a user's own
- // choice is kept. Automatic downloads follow the Settings toggle.
- reply(SUUpdatePermissionResponse(automaticUpdateChecks: true, sendSystemProfile: false))
+ // Checking and downloading are on by default (SUEnableAutomaticChecks,
+ // SUAutomaticallyUpdate); a user's own choice is kept. Nothing
+ // restarts the app without a click on "Restart to update".
+ reply(SUUpdatePermissionResponse(automaticUpdateChecks: true, automaticUpdateDownloading: true as NSNumber,
+ sendSystemProfile: false))
}
public func showUserInitiatedUpdateCheck(cancellation: @escaping () -> Void) { beginUserCheck() }
diff --git a/apps/cua-spaces-macos/Support/Info.plist b/apps/cua-spaces-macos/Support/Info.plist
index 87e0008789..e4a80ed2f3 100644
--- a/apps/cua-spaces-macos/Support/Info.plist
+++ b/apps/cua-spaces-macos/Support/Info.plist
@@ -51,6 +51,8 @@
<string>4ikTEz/qr6f2gooAccIHFi5tuP3uEeQEW0QboJu2f+0=</string>
<key>SUEnableAutomaticChecks</key>
<true/>
+ <key>SUAutomaticallyUpdate</key>
+ <true/>
<key>SUVerifyUpdateBeforeExtraction</key>
<true/>
</dict>
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LoginItemTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LoginItemTests.swift
index b88471d25b..54000962b7 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LoginItemTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LoginItemTests.swift
@@ -116,6 +116,29 @@ struct LoginItemTests {
#expect(b.settings.launchAtLogin == false)
}
+ /// macOS shows "Login Item Added" the moment an app registers. Nothing
+ /// registers on a fresh install until the user presses Start: not the
+ /// first launch, not walking the pages, not ticking or unticking the box.
+ @Test func nothingRegistersBeforeStart() async {
+ let item = FixtureLoginItem()
+ let m = ViewModelTests().makeModel(loginItem: item)
+ #expect(!m.onboarding.completed)
+ await m.applyLaunchAtLogin()
+ m.readLoginItem()
+ #expect(item.calls.isEmpty, "the first launch registers nothing")
+ for action: AppOnboardingAction in [.start, .signinDone, .agentsDone(configured: []), .presentationDone,
+ .driveContinue, .modeChosen(mode: .host)] {
+ m.onboarding.send(action)
+ #expect(item.calls.isEmpty, "\(action) registers nothing")
+ }
+ m.onboarding.send(.launchAtLoginToggled(on: false))
+ m.onboarding.send(.launchAtLoginToggled(on: true))
+ await m.applyLaunchAtLogin()
+ #expect(item.calls.isEmpty, "the Done checkbox only records the choice")
+ m.onboarding.finish()
+ #expect(item.calls == ["register"], "Start registers it, once")
+ }
+
@Test func atLaunchAnUnchosenServingMacTurnsOnAndAChoiceStands() async throws {
// Provides Spaces (a spare machine), first run done before the setting.
let host = FixtureHost()
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/UpdatesTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/UpdatesTests.swift
index 0837c92a12..ad851c7bd2 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/UpdatesTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/UpdatesTests.swift
@@ -66,6 +66,17 @@ struct UpdatesTests {
#expect(v.updates?.lastCheck != "Last check: Never")
}
+ /// Updates check and download in the background out of the box, like
+ /// Windows and Linux; only a click on "Restart to update" restarts.
+ @Test func updatesDownloadInTheBackgroundByDefault() throws {
+ let plist = URL(fileURLWithPath: #filePath)
+ .deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent()
+ .appendingPathComponent("Support/Info.plist")
+ let info = try #require(try PropertyListSerialization.propertyList(from: Data(contentsOf: plist), format: nil) as? [String: Any])
+ #expect(info["SUEnableAutomaticChecks"] as? Bool == true)
+ #expect(info["SUAutomaticallyUpdate"] as? Bool == true)
+ }
+
@Test func noUpdaterNoControls() {
let model = UpdatesModel(updater: nil, info: Self.info)
#expect(model.view.updates == nil)
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
index e5f45fd822..c445322631 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
@@ -335,7 +335,8 @@ struct ViewModelTests {
var panel = h.panel
#expect(panel.toggles.map(\.on) == [false, true])
#expect(panel.toggles.map(\.enabled) == [true, true], "both may be off")
- #expect(panel.limits?.contains("Apple\u{2019}s license allows two per Mac") == true)
+ #expect(panel.limits?.hasSuffix("2 macOS VMs") == true)
+ #expect(panel.limits?.contains("license") == false)
#expect(panel.providedEmpty == "None yet")
#expect(panel.permissions.isEmpty, "no desktop, no screen permissions")
await h.run(panel.toggles[0].action)
diff --git a/apps/cua-spaces-web/scripts/screenshots.mjs b/apps/cua-spaces-web/scripts/screenshots.mjs
index 7a3cf1fd8b..c1a0a77521 100644
--- a/apps/cua-spaces-web/scripts/screenshots.mjs
+++ b/apps/cua-spaces-web/scripts/screenshots.mjs
@@ -50,6 +50,7 @@ async function onboardingSteps(theme) {
await page.getByRole("button", { name: "Continue", exact: true }).click();
await shot("this-machine");
await page.getByTestId("onboarding-client").click();
+ await page.getByRole("button", { name: "Continue", exact: true }).click();
await shot("done");
await context.close();
}
diff --git a/apps/cua-spaces-web/src/__tests__/about-updates.test.tsx b/apps/cua-spaces-web/src/__tests__/about-updates.test.tsx
index 9850a4380c..8e98a4ff63 100644
--- a/apps/cua-spaces-web/src/__tests__/about-updates.test.tsx
+++ b/apps/cua-spaces-web/src/__tests__/about-updates.test.tsx
@@ -57,7 +57,7 @@ describe.skipIf(!wasmBuilt)("Settings, About", () => {
expect(q("[data-about-check]")!.textContent).toBe("Check Now");
expect(q("[data-about-auto-check]")!.hasAttribute("data-disabled")).toBe(true);
expect(q("[data-about-auto-install]")!.hasAttribute("data-disabled")).toBe(true);
- expect(document.body.textContent).toContain("Automatically check for updates");
+ expect(document.body.textContent).toContain("Check for and download updates automatically");
expect(document.body.textContent).toContain("Update to:");
});
diff --git a/apps/cua-spaces-web/src/bridge/__tests__/friendly-errors.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/friendly-errors.test.ts
new file mode 100644
index 0000000000..2042906b4d
--- /dev/null
+++ b/apps/cua-spaces-web/src/bridge/__tests__/friendly-errors.test.ts
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import { limitsFor, plainJoinError, plainPairingError, stripInternalPrefixes } from "../friendly-errors";
+
+let warn: ReturnType<typeof vi.spyOn>;
+beforeEach(() => {
+ warn = vi.spyOn(console, "warn").mockImplementation(() => {});
+});
+afterEach(() => warn.mockRestore());
+
+describe("plain host errors", () => {
+ it("strips the command's and relay's prefixes", () => {
+ expect(stripInternalPrefixes("cua: relay: disk full")).toBe("Disk full");
+ expect(stripInternalPrefixes("host setup failed at register: oops")).toBe("Oops");
+ expect(stripInternalPrefixes("")).toBe("");
+ });
+
+ it("joins: a bad code is one plain line, and the raw text goes to the log", () => {
+ const raw = "cua: unauthenticated: host setup failed at register: relay: pairing code is not valid";
+ const text = plainJoinError(new Error(raw));
+ expect(text).toBe("That code didn't work. It may be used, expired or mistyped. Make a new one in Add a machine.");
+ expect(warn).toHaveBeenCalledWith(expect.any(String), raw);
+ });
+
+ it("joins: other failures lose the prefixes", () => {
+ expect(plainJoinError(new Error("cua: host setup failed at install: disk is full"))).toBe("Disk is full");
+ expect(plainJoinError(new Error("cua host setup timed out"))).toMatch(/took too long/);
+ });
+
+ it("pairing: an unregistered computer is told to set up first", () => {
+ const text = plainPairingError(new Error("not found: relay: no such device"));
+ expect(text).toBe("This computer isn't set up for access yet. Set it up first, then add machines.");
+ });
+
+ it("pairing: other failures keep a plain reason", () => {
+ expect(plainPairingError(new Error("relay: quota exceeded"))).toBe("Couldn't make a link: Quota exceeded.");
+ expect(plainPairingError(new Error(""))).toBe("Couldn't make a link.");
+ });
+});
+
+describe("the limits line per system", () => {
+ const line = "Up to 4 Spaces \u00b7 2 macOS VMs";
+ it("keeps the macOS VMs on a Mac and drops them elsewhere, with no license wording", () => {
+ expect(limitsFor(line, true)).toBe(line);
+ expect(limitsFor(line, false)).toBe("Up to 4 Spaces");
+ expect(limitsFor("Up to 4 Spaces \u00b7 1 macOS VM", false)).toBe("Up to 4 Spaces");
+ expect(limitsFor("No Space limit", false)).toBe("No Space limit");
+ expect(`${limitsFor(line, true)}${limitsFor(line, false)}`).not.toMatch(/license|Apple/i);
+ });
+});
diff --git a/apps/cua-spaces-web/src/bridge/contracts/onboarding.ts b/apps/cua-spaces-web/src/bridge/contracts/onboarding.ts
index ee60c555e4..7ac0bc1e04 100644
--- a/apps/cua-spaces-web/src/bridge/contracts/onboarding.ts
+++ b/apps/cua-spaces-web/src/bridge/contracts/onboarding.ts
@@ -135,6 +135,8 @@ export interface OnboardingView {
usage?: OnboardingUsage | null;
/** The Cua Volume page's card (on its page only). */
drive?: DriveCard | null;
+ /** Done's example prompts, one line each (on Done only). */
+ prompts?: string[];
/** Done's "Launch at login" checkbox (on Done only). */
launchAtLogin?: OnboardingCheckbox | null;
}
diff --git a/apps/cua-spaces-web/src/bridge/friendly-errors.ts b/apps/cua-spaces-web/src/bridge/friendly-errors.ts
new file mode 100644
index 0000000000..81e08dda62
--- /dev/null
+++ b/apps/cua-spaces-web/src/bridge/friendly-errors.ts
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+/**
+ * Plain words for the host's raw failures. The `cua` command and the relay
+ * word errors for logs ("cua: unauthenticated: host setup failed at
+ * register: relay: ..."); a person gets one short line. The raw text goes to
+ * the console log (the app's log file), never away.
+ */
+
+/** Internal prefixes the command and relay put in front of the part a person can use. */
+const PREFIX = /^(?:(?:cua|relay|error|unauthenticated|not[ _]found|host setup failed at [\w-]+)\s*:\s*)+/i;
+
+/** `text` without internal prefixes ("cua: relay: ..." becomes "..."), first letter capitalised. */
+export function stripInternalPrefixes(text: string): string {
+ const s = text.trim().replace(PREFIX, "").trim();
+ return s ? s.charAt(0).toUpperCase() + s.slice(1) : "";
+}
+
+function rawText(e: unknown): string {
+ return e instanceof Error ? e.message : String(e);
+}
+
+/** What "Join with a code" says for a failure. */
+export function plainJoinError(e: unknown): string {
+ const raw = rawText(e);
+ console.warn("[Cua Spaces] join with a code failed:", raw);
+ if (/pairing code|unauthenticated|not valid|expired|revoked|already used|invalid code/i.test(raw)) {
+ return "That code didn't work. It may be used, expired or mistyped. Make a new one in Add a machine.";
+ }
+ if (/timed out/i.test(raw)) return "This took too long. Check the internet connection and try again.";
+ if (/could not start|no bundled cua/i.test(raw)) return "Couldn't set this computer up. Update Cua Spaces and try again.";
+ if (/network|connect|dns|unreachable|offline/i.test(raw)) return "Couldn't reach Cua. Check the internet connection and try again.";
+ return stripInternalPrefixes(raw) || "Couldn't join with that code.";
+}
+
+/** What "Add a machine" says when it can't make a link. */
+export function plainPairingError(e: unknown): string {
+ const raw = rawText(e);
+ console.warn("[Cua Spaces] making a pairing link failed:", raw);
+ if (/no such device|not enrolled|not registered|unknown device/i.test(raw)) {
+ return "This computer isn't set up for access yet. Set it up first, then add machines.";
+ }
+ if (/unauthenticated|unauthori[sz]ed|\b40[13]\b/i.test(raw)) return "Sign in again to add a machine.";
+ if (/network|connect|dns|unreachable|offline|timed out/i.test(raw)) return "Couldn't reach Cua. Check the internet connection.";
+ const rest = stripInternalPrefixes(raw).replace(/\.$/, "");
+ return rest ? `Couldn't make a link: ${rest}.` : "Couldn't make a link.";
+}
+
+/**
+ * The This machine panel's limits line for this system. The core words it
+ * for a Mac ("Up to 4 Spaces · 2 macOS VMs"); macOS VMs run on a Mac only,
+ * so elsewhere that part is dropped.
+ */
+export function limitsFor(limits: string, mac: boolean): string {
+ return mac ? limits : limits.replace(/\s*·\s*\d+ macOS VMs?\b.*$/, "");
+}
diff --git a/apps/cua-spaces-web/src/bridge/join.ts b/apps/cua-spaces-web/src/bridge/join.ts
index 050670979d..2f5202c112 100644
--- a/apps/cua-spaces-web/src/bridge/join.ts
+++ b/apps/cua-spaces-web/src/bridge/join.ts
@@ -12,6 +12,7 @@ import { useCallback, useState } from "react";
import { isUnsupported } from "./adapter";
import { useBridge } from "./hooks";
+import { plainJoinError } from "./friendly-errors";
import { normalizePairingCode, pairingLinkRelay } from "./pairing-code";
export type JoinPhase = "idle" | "joining" | "joined" | "failed";
@@ -28,8 +29,7 @@ export interface JoinHook {
/** What the page says for a failure: the host's own words, or a plain line. */
export function joinFailureText(e: unknown): string {
if (isUnsupported(e)) return "This version of Cua Spaces can't join with a code. Update the app, or run the install command on this computer.";
- const text = e instanceof Error ? e.message : String(e);
- return text.trim() || "Couldn't join with that code.";
+ return plainJoinError(e);
}
export function useJoinWithCode({ onJoined }: { onJoined?: () => void } = {}): JoinHook {
diff --git a/apps/cua-spaces-web/src/bridge/pairing.ts b/apps/cua-spaces-web/src/bridge/pairing.ts
index 28f9fc1b9c..0dd68bbbf3 100644
--- a/apps/cua-spaces-web/src/bridge/pairing.ts
+++ b/apps/cua-spaces-web/src/bridge/pairing.ts
@@ -18,6 +18,7 @@ import { useEffect, useRef, useState } from "react";
import { HostError, isUnsupported } from "./adapter";
import type { PairingCode } from "./contracts/devices";
+import { plainPairingError } from "./friendly-errors";
import { useBridge } from "./hooks";
/** How often an open "Add a machine" asks whether its code was used (ms). */
@@ -106,7 +107,7 @@ export function usePairingCode({
},
(e: unknown) => {
if (mine !== seq.current) return;
- setState({ phase: "error", code: null, error: { message: e instanceof Error ? e.message : String(e), unsupported: pairingUnsupported(e) } });
+ setState({ phase: "error", code: null, error: { message: plainPairingError(e), unsupported: pairingUnsupported(e) } });
},
);
};
diff --git a/apps/cua-spaces-web/src/components/__tests__/add-machine-dialog.test.tsx b/apps/cua-spaces-web/src/components/__tests__/add-machine-dialog.test.tsx
index 8edaa9c6ed..6a1941e12e 100644
--- a/apps/cua-spaces-web/src/components/__tests__/add-machine-dialog.test.tsx
+++ b/apps/cua-spaces-web/src/components/__tests__/add-machine-dialog.test.tsx
@@ -197,11 +197,12 @@ describe("Add a machine by link or QR code", () => {
const base = adapter.call.bind(adapter);
const flaky = Object.assign(Object.create(adapter) as DataAdapter, {
call: ((op: string, args: never) =>
- op === "devices.createPairingCode" && fail ? Promise.reject(new Error("relay unreachable")) : base(op as never, args)) as DataAdapter["call"],
+ op === "devices.createPairingCode" && fail ? Promise.reject(new Error("not found: relay: no such device")) : base(op as never, args)) as DataAdapter["call"],
});
await mount(flaky);
await waitFor(() => expect(phase()).toBe("error"));
- expect(screen.getByText(/Couldn't make a link: relay unreachable/)).toBeTruthy();
+ expect(screen.getByText(/This computer isn't set up for access yet\. Set it up first, then add machines\./)).toBeTruthy();
+ expect(document.body.textContent).not.toMatch(/relay: no such device|not found:/);
fail = false;
fireEvent.click(screen.getByText("Try again"));
await waitFor(() => expect(phase()).toBe("ready"));
diff --git a/apps/cua-spaces-web/src/components/__tests__/join-with-code-dialog.test.tsx b/apps/cua-spaces-web/src/components/__tests__/join-with-code-dialog.test.tsx
index 261f7d6667..0180ac9a6a 100644
--- a/apps/cua-spaces-web/src/components/__tests__/join-with-code-dialog.test.tsx
+++ b/apps/cua-spaces-web/src/components/__tests__/join-with-code-dialog.test.tsx
@@ -85,12 +85,26 @@ describe("Join with a code", () => {
await mount(adapter, { initialCode: "K7QM4XPB2RHD" });
fireEvent.click(join());
await waitFor(() => expect(state()).toBe("failed"));
- expect(document.querySelector("[data-join-error]")?.textContent).toBe("this pairing code was already used");
+ expect(document.querySelector("[data-join-error]")?.textContent).toBe(
+ "That code didn't work. It may be used, expired or mistyped. Make a new one in Add a machine.",
+ );
expect(field().disabled).toBe(false);
fireEvent.click(join());
await waitFor(() => expect(state()).toBe("joined"));
});
+ it("hides the command's internal prefixes", async () => {
+ const { adapter } = host(async () => {
+ throw new HostError("cua: unauthenticated: host setup failed at register: relay: pairing code is not valid; make a new one", "failed");
+ });
+ await mount(adapter, { initialCode: "K7QM4XPB2RHD" });
+ fireEvent.click(join());
+ await waitFor(() => expect(state()).toBe("failed"));
+ const text = document.querySelector("[data-join-error]")?.textContent ?? "";
+ expect(text).toContain("That code didn't work");
+ expect(text).not.toMatch(/unauthenticated|host setup failed|relay:/);
+ });
+
it("says plainly when the host can't join with a code", async () => {
const { adapter } = host(async () => {
throw new HostError("no such method", "unsupported");
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 ad156c4a6f..4dcf375a65 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
@@ -8,7 +8,8 @@ import { BridgeProvider, useOnboarding, useSession, useThisMachine, type Onboard
import { createDemoAdapter } from "@/bridge/adapters/demo";
import { readSavedOnboarding, resetSavedOnboardingCache } from "@/bridge/onboarding";
import { testCore, wasmBuilt } from "@/bridge/__tests__/testCore";
-import { ModeCard } from "@/components/onboarding-mode";
+import { ModeCard, ModeContinue, useModeChoice } from "@/components/onboarding-mode";
+import { pressPrimaryOnReturn } from "@/components/onboarding-keys";
beforeEach(() => {
localStorage.clear();
@@ -22,9 +23,32 @@ function Page() {
const flow = useOnboarding();
const { data: session } = useSession();
const host = useThisMachine(session?.identity ?? null);
+ const choice = useModeChoice(flow, flow.view, host);
probe.flow = flow;
if (flow.view?.step !== "mode") return null;
- return <ModeCard flow={flow} view={flow.view} host={host} />;
+ return (
+ <div onKeyDown={pressPrimaryOnReturn}>
+ <h1 tabIndex={-1} data-testid="heading">
+ {flow.view.title}
+ </h1>
+ <ModeCard flow={flow} view={flow.view} host={host} choice={choice} />
+ <ModeContinue view={flow.view} host={host} choice={choice} />
+ </div>
+ );
+}
+
+async function toMode() {
+ const adapter = createDemoAdapter({ latencyMs: 1, stepMs: 1, signedIn: true, onboarded: false });
+ render(
+ <BridgeProvider adapter={adapter} core={await testCore()} storeOptions={{ tickMs: 5 }}>
+ <Page />
+ </BridgeProvider>,
+ );
+ await waitFor(() => expect(probe.flow.state).toBeTruthy());
+ act(() => probe.flow.send({ type: "start" }));
+ act(() => probe.flow.send({ type: "signin-done" }));
+ act(() => probe.flow.send({ type: "agents-done", configured: [] }));
+ act(() => probe.flow.send({ type: "presentation-done" }));
}
describe.skipIf(!wasmBuilt)("This machine in the first run", () => {
@@ -45,7 +69,10 @@ describe.skipIf(!wasmBuilt)("This machine in the first run", () => {
expect(screen.queryByText(/Available once this machine is set up/)).toBeNull();
expect(hostChoice.textContent).toMatch(/Next: name this machine/);
+ // Choosing only selects; Continue opens the form.
fireEvent.click(hostChoice);
+ expect(document.querySelector("[data-host-form]")).toBeNull();
+ fireEvent.click(await screen.findByRole("button", { name: /Continue/ }));
const form = await waitFor(() => {
const f = document.querySelector("[data-host-form]");
if (!f) throw new Error("no host form");
@@ -70,6 +97,18 @@ describe.skipIf(!wasmBuilt)("This machine in the first run", () => {
act(() => probe.flow.send({ type: "agents-done", configured: [] }));
act(() => probe.flow.send({ type: "presentation-done" }));
fireEvent.click(await screen.findByTestId("onboarding-client"));
+ expect(readSavedOnboarding().state?.step).toBe("mode");
+ fireEvent.click(await screen.findByRole("button", { name: /Continue/ }));
+ expect(readSavedOnboarding().state).toMatchObject({ step: "done", mode: "client" });
+ });
+
+ it("always has an enabled Continue, with Access other machines 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");
+ fireEvent.keyDown(screen.getByTestId("heading"), { key: "Enter" });
expect(readSavedOnboarding().state).toMatchObject({ step: "done", mode: "client" });
});
});
diff --git a/apps/cua-spaces-web/src/components/__tests__/onboarding-prompts.test.tsx b/apps/cua-spaces-web/src/components/__tests__/onboarding-prompts.test.tsx
new file mode 100644
index 0000000000..d22edbb41e
--- /dev/null
+++ b/apps/cua-spaces-web/src/components/__tests__/onboarding-prompts.test.tsx
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+import { act, cleanup, fireEvent, render, screen } from "@testing-library/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import { ExamplePrompts } from "@/components/onboarding-prompts";
+
+afterEach(cleanup);
+
+const PROMPTS = ["Open a Linux Space and run my test suite in it", "Share this Space with a teammate as a viewer"];
+
+describe("Done's example prompts", () => {
+ it("lists each prompt under 'Try asking your agent:' and copies one on click", async () => {
+ const writeText = vi.fn().mockResolvedValue(undefined);
+ Object.defineProperty(navigator, "clipboard", { value: { writeText }, configurable: true });
+ render(<ExamplePrompts prompts={PROMPTS} />);
+ expect(screen.getByText("Try asking your agent:")).toBeTruthy();
+ expect(screen.getAllByRole("button")).toHaveLength(2);
+ await act(async () => {
+ fireEvent.click(screen.getByText(`“${PROMPTS[1]}”`));
+ });
+ expect(writeText).toHaveBeenCalledWith(PROMPTS[1]);
+ expect(screen.getByText("Copied")).toBeTruthy();
+ });
+
+ it("shows nothing without prompts", () => {
+ const { container } = render(<ExamplePrompts prompts={[]} />);
+ expect(container.textContent).toBe("");
+ });
+});
diff --git a/apps/cua-spaces-web/src/components/add-machine-dialog.tsx b/apps/cua-spaces-web/src/components/add-machine-dialog.tsx
index 1ba0293fcf..28c19d4072 100644
--- a/apps/cua-spaces-web/src/components/add-machine-dialog.tsx
+++ b/apps/cua-spaces-web/src/components/add-machine-dialog.tsx
@@ -96,7 +96,7 @@ export function AddMachineDialog({
<Notice>
{pairing.error?.unsupported
? "Your Cua relay can't make links yet. Set the computer up by hand instead."
- : `Couldn't make a link: ${pairing.error?.message ?? "unknown error"}. Set the computer up by hand instead.`}
+ : `${pairing.error?.message ?? "Couldn't make a link."} Set the computer up by hand instead.`}
<Button variant="outline" size="sm" className="mt-2 flex" onClick={pairing.renew}>
Try again
</Button>
diff --git a/apps/cua-spaces-web/src/components/onboarding-mode.tsx b/apps/cua-spaces-web/src/components/onboarding-mode.tsx
index d04ed8b562..9b69c4b600 100644
--- a/apps/cua-spaces-web/src/components/onboarding-mode.tsx
+++ b/apps/cua-spaces-web/src/components/onboarding-mode.tsx
@@ -3,7 +3,8 @@
import { useState } from "react";
-import { useMachines, useThisMachine, type OnboardingHook, type OnboardingView } from "@/bridge";
+import { useMachines, useThisMachine, type OnboardingHook, type OnboardingMode, type OnboardingView } from "@/bridge";
+import { Button } from "@/components/ui/button";
import { JoinWithCodeDialog } from "@/components/join-with-code-dialog";
import { HostSetupForm } from "@/components/this-machine";
import { cn } from "@/lib/utils";
@@ -11,12 +12,36 @@ import { cn } from "@/lib/utils";
type HostSetup = ReturnType<typeof useThisMachine>;
/**
- * Access other machines finishes the page. Set up this machine opens host
- * setup's form here (as the SwiftUI app does), with the permissions it
- * needs under it; the page moves on once setup worked. A machine already
- * set up goes straight on.
+ * The This machine page's choice: the cards only select, and Continue (Return
+ * too) moves on, like every other page. "Access other machines" is selected
+ * to begin with, so Continue is always there. Continuing with Access other
+ * machines finishes the page; with Set up this machine it opens host setup's
+ * form (as the SwiftUI app does), and the page moves on once setup worked. A
+ * machine already set up goes straight on.
*/
-export function ModeCard({ flow, view, host }: { flow: OnboardingHook; view: OnboardingView; host: HostSetup }) {
+export function useModeChoice(flow: OnboardingHook, view: OnboardingView | null | undefined, host: HostSetup) {
+ const [picked, setPicked] = useState<OnboardingMode | null>(null);
+ const selected: OnboardingMode = picked ?? view?.preselectedMode ?? "client";
+ const advance = () => {
+ if (selected === "host" && !flow.hostConfigured) host.openForm();
+ else flow.send({ type: "mode-chosen", mode: selected });
+ };
+ return { selected, select: setPicked, advance };
+}
+
+export type ModeChoice = ReturnType<typeof useModeChoice>;
+
+/** The page's Continue button (not shown while host setup's form is open: it has its own). */
+export function ModeContinue({ view, host, choice }: { view: OnboardingView; host: HostSetup; choice: ModeChoice }) {
+ if (host.formView) return null;
+ return (
+ <Button size="lg" data-onboarding-primary="" data-mode-continue="" onClick={choice.advance}>
+ {view.primaryLabel}
+ </Button>
+ );
+}
+
+export function ModeCard({ flow, view, host, choice }: { flow: OnboardingHook; view: OnboardingView; host: HostSetup; choice: ModeChoice }) {
const { data: machines } = useMachines();
const [joining, setJoining] = useState(false);
if (host.formView) {
@@ -39,24 +64,29 @@ export function ModeCard({ flow, view, host }: { flow: OnboardingHook; view: Onb
);
}
return (
- <div className="flex flex-col gap-2.5">
- {view.choices.map((choice) => {
- const setUp = choice.mode === "host" && !flow.hostConfigured;
+ <div className="flex flex-col gap-2.5" role="radiogroup" aria-label={view.title}>
+ {view.choices.map((c) => {
+ const setUp = c.mode === "host" && !flow.hostConfigured;
+ const on = c.mode === choice.selected;
return (
<button
- key={choice.mode}
+ key={c.mode}
type="button"
- onClick={() => (setUp ? host.openForm() : flow.send({ type: "mode-chosen", mode: choice.mode }))}
- data-testid={`onboarding-${choice.mode}`}
- // Return on the page picks the preselected choice.
- data-onboarding-primary={choice.preselected ? "" : undefined}
+ role="radio"
+ aria-checked={on}
+ onClick={() => {
+ choice.select(c.mode);
+ // Return then continues, as on every other page.
+ requestAnimationFrame(() => document.querySelector<HTMLElement>("[data-mode-continue]")?.focus());
+ }}
+ data-testid={`onboarding-${c.mode}`}
className={cn(
"rounded-xl border bg-card px-4 py-3.5 text-left shadow-xs outline-none transition-[border-color,box-shadow]",
"hover:border-foreground/20 focus-visible:border-brand focus-visible:ring-3 focus-visible:ring-brand/25",
- choice.preselected && "border-foreground/40",
+ on && "border-foreground/60 ring-1 ring-foreground/30",
)}
>
- <div className="text-[13px] font-semibold">{choice.label}</div>
+ <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>
) : null}
diff --git a/apps/cua-spaces-web/src/components/onboarding-prompts.tsx b/apps/cua-spaces-web/src/components/onboarding-prompts.tsx
new file mode 100644
index 0000000000..2ce83243d0
--- /dev/null
+++ b/apps/cua-spaces-web/src/components/onboarding-prompts.tsx
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+import { useEffect, useRef, useState } from "react";
+
+/**
+ * Done's example prompts (the core's three static lines, as the SwiftUI app
+ * shows them under both columns): "Try asking your agent:" and a few things
+ * to say once a coding agent has the cua skills and tools. Each copies to the
+ * clipboard on click and says "Copied". They show on every system, whether or
+ * not an agent was set up here: the lines work with any agent that has them.
+ */
+export function ExamplePrompts({ prompts }: { prompts: string[] }) {
+ const [copied, setCopied] = useState<string | null>(null);
+ const timer = useRef<number | undefined>(undefined);
+ useEffect(() => () => window.clearTimeout(timer.current), []);
+ if (prompts.length === 0) return null;
+ const copy = (text: string) => {
+ void navigator.clipboard?.writeText(text).then(
+ () => {
+ setCopied(text);
+ window.clearTimeout(timer.current);
+ timer.current = window.setTimeout(() => setCopied(null), 1500);
+ },
+ () => {},
+ );
+ };
+ return (
+ <section className="mt-8" aria-labelledby="onboarding-prompts" data-onboarding-prompts="">
+ <h2 id="onboarding-prompts" className="mb-2 text-[13px] font-semibold">
+ Try asking your agent:
+ </h2>
+ <ul className="flex flex-col gap-1">
+ {prompts.map((p) => (
+ <li key={p}>
+ <button
+ type="button"
+ onClick={() => copy(p)}
+ title="Copies this prompt"
+ className="flex w-full items-center justify-between gap-4 rounded-lg px-3 py-1.5 text-left text-[13px] text-muted-foreground outline-none hover:bg-muted hover:text-foreground focus-visible:ring-3 focus-visible:ring-brand/25"
+ >
+ <span className="truncate">{`“${p}”`}</span>
+ <span className="shrink-0 text-xs" aria-live="polite">
+ {copied === p ? "Copied" : ""}
+ </span>
+ </button>
+ </li>
+ ))}
+ </ul>
+ </section>
+ );
+}
diff --git a/apps/cua-spaces-web/src/components/this-machine.tsx b/apps/cua-spaces-web/src/components/this-machine.tsx
index f061fe28ab..a65d43b242 100644
--- a/apps/cua-spaces-web/src/components/this-machine.tsx
+++ b/apps/cua-spaces-web/src/components/this-machine.tsx
@@ -14,6 +14,8 @@ import {
type HostPanelView,
type HostSetupFormView,
} from "@/bridge";
+import { limitsFor } from "@/bridge/friendly-errors";
+import { hostOs } from "@/bridge/host-os";
import { ConfirmDialog } from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
@@ -102,7 +104,7 @@ export function ThisMachine({ panel, progress }: { panel: HostPanelView; progres
<Switch checked={t.on} disabled={host.busy || !t.enabled} aria-label={t.label} onCheckedChange={() => void host.run(t.action)} />
</Row>
))}
- {panel.limits ? <p className="px-4 py-2.5 text-xs text-muted-foreground">{panel.limits}</p> : null}
+ {panel.limits ? <p className="px-4 py-2.5 text-xs text-muted-foreground">{limitsFor(panel.limits, hostOs() === "macos")}</p> : null}
</Group>
) : null}
diff --git a/apps/cua-spaces-web/src/routes/onboarding/index.tsx b/apps/cua-spaces-web/src/routes/onboarding/index.tsx
index 5f3ad3fbce..785dc3abea 100644
--- a/apps/cua-spaces-web/src/routes/onboarding/index.tsx
+++ b/apps/cua-spaces-web/src/routes/onboarding/index.tsx
@@ -20,7 +20,8 @@ import { AddMachineDialog } from "@/components/add-machine-dialog";
import { CuaLogo } from "@/components/cua-logo";
import { useAgentsStep, type AgentsStep } from "@/components/volume/use-agents-step";
import { OsIcon } from "@/components/os-icon";
-import { ModeCard } from "@/components/onboarding-mode";
+import { ExamplePrompts } from "@/components/onboarding-prompts";
+import { ModeCard, ModeContinue, useModeChoice, type ModeChoice } from "@/components/onboarding-mode";
import { PresentationCards } from "@/components/onboarding-presentation";
import { pressPrimaryOnReturn } from "@/components/onboarding-keys";
import { SetUpLater } from "@/components/onboarding-skip";
@@ -38,6 +39,13 @@ export const Route = createFileRoute("/onboarding/")({ component: OnboardingPage
const AgentsCard = lazy(() => import("@/components/volume/agents-step").then((m) => ({ default: m.AgentsCard })));
const DriveCardView = lazy(() => import("@/components/volume/drive-card").then((m) => ({ default: m.DriveCardView })));
+/** Done's example prompts when the core doesn't send them (`OnboardingView.prompts` is the core's `PROMPTS`). */
+const EXAMPLE_PROMPTS = [
+ "Open a Linux Space and run my test suite in it",
+ "Use my Space's browser to finish the checkout test and show me",
+ "Share this Space with a teammate as a viewer",
+];
+
/** Sign in is optional: everything local works without an account. */
const NO_ACCOUNT_NEEDED = "No account needed to start.";
@@ -54,6 +62,25 @@ function OnboardingPage() {
const { view } = flow;
useOnboardingVolume(flow);
const agents = useAgentsStep(view?.step === "agents");
+ // Host setup's form and the choice on This machine, which the footer's Continue shares.
+ const { data: session } = useSession();
+ const host = useThisMachine(session?.identity ?? null);
+ const choice = useModeChoice(flow, view, host);
+
+ // Return with nothing focused (the window just opened, or focus is on the
+ // page itself) presses the primary button too.
+ useEffect(() => {
+ const onKey = (e: KeyboardEvent) => {
+ if (e.key !== "Enter" || e.defaultPrevented || e.isComposing || e.metaKey || e.ctrlKey || e.altKey || e.shiftKey) return;
+ if (e.target !== document.body && e.target !== document.documentElement) return;
+ const primary = document.querySelector<HTMLButtonElement>("[data-step] [data-onboarding-primary]:not(:disabled)");
+ if (!primary) return;
+ e.preventDefault();
+ primary.click();
+ };
+ document.addEventListener("keydown", onKey);
+ return () => document.removeEventListener("keydown", onKey);
+ }, []);
const leave = () => {
flow.skip();
@@ -82,9 +109,9 @@ function OnboardingPage() {
<div className="relative flex h-full flex-col" data-step={view.step} onKeyDown={pressPrimaryOnReturn}>
{view.step !== "done" ? <SetUpLater onClick={leave} /> : null}
<div className="flex min-h-0 flex-1 flex-col items-center justify-center overflow-y-auto px-10 py-6">
- {view.step === "welcome" ? <Welcome flow={flow} view={view} /> : <Columns flow={flow} view={view} agents={agents} />}
+ {view.step === "welcome" ? <Welcome flow={flow} view={view} /> : <Columns flow={flow} view={view} agents={agents} host={host} choice={choice} />}
</div>
- <Footer flow={flow} view={view} agents={agents} onFinish={() => void finish()} />
+ <Footer flow={flow} view={view} agents={agents} host={host} choice={choice} onFinish={() => void finish()} />
</div>
);
}
@@ -145,10 +172,21 @@ function Welcome({ flow, view }: { flow: OnboardingHook; view: OnboardingView })
/* ---- Two-column pages --------------------------------------------------------- */
-function Columns({ flow, view, agents }: { flow: OnboardingHook; view: OnboardingView; agents: AgentsStep }) {
- const { data: session } = useSession();
- // Host setup's form, opened from the host choice on This machine.
- const host = useThisMachine(session?.identity ?? null);
+type HostSetup = ReturnType<typeof useThisMachine>;
+
+function Columns({
+ flow,
+ view,
+ agents,
+ host,
+ choice,
+}: {
+ flow: OnboardingHook;
+ view: OnboardingView;
+ agents: AgentsStep;
+ host: HostSetup;
+ choice: ModeChoice;
+}) {
const settingUpHost = view.step === "mode" && host.formView !== null;
// Leaving the page (Back) leaves the form too.
const formOpen = host.form !== null;
@@ -190,12 +228,13 @@ function Columns({ flow, view, agents }: { flow: OnboardingHook; view: Onboardin
</Suspense>
</Card>
) : null}
- {view.step === "mode" ? <ModeCard flow={flow} view={view} host={host} /> : null}
+ {view.step === "mode" ? <ModeCard flow={flow} view={view} host={host} choice={choice} /> : null}
{view.step === "done" ? <DoneCard view={view} flow={flow} /> : null}
</div>
</div>
{/* Only hosts need Screen Recording and Accessibility (the core's host setup). */}
{settingUpHost && (flow.permissions.length > 0 || flow.grantedPermissions.length > 0) ? <Permissions flow={flow} /> : null}
+ {view.step === "done" ? <ExamplePrompts prompts={view.prompts ?? EXAMPLE_PROMPTS} /> : null}
{view.step === "done" ? <FirstSpace images={flow.images} /> : null}
</div>
);
@@ -425,7 +464,21 @@ function AnotherComputer() {
/* ---- Footer ---------------------------------------------------------------------- */
-function Footer({ flow, view, agents, onFinish }: { flow: OnboardingHook; view: OnboardingView; agents: AgentsStep; onFinish: () => void }) {
+function Footer({
+ flow,
+ view,
+ agents,
+ host,
+ choice,
+ onFinish,
+}: {
+ flow: OnboardingHook;
+ view: OnboardingView;
+ agents: AgentsStep;
+ host: HostSetup;
+ choice: ModeChoice;
+ onFinish: () => void;
+}) {
return (
<div className="relative flex h-16 shrink-0 items-center px-6 pb-2">
<div className="z-10">
@@ -436,7 +489,7 @@ function Footer({ flow, view, agents, onFinish }: { flow: OnboardingHook; view:
) : null}
</div>
<Dots view={view} />
- <div className="z-10 ml-auto flex items-center gap-2">{view.step !== "welcome" ? <Trailing flow={flow} view={view} agents={agents} onFinish={onFinish} /> : null}</div>
+ <div className="z-10 ml-auto flex items-center gap-2">{view.step !== "welcome" ? <Trailing flow={flow} view={view} agents={agents} host={host} choice={choice} onFinish={onFinish} /> : null}</div>
</div>
);
}
@@ -459,7 +512,21 @@ function Dots({ view }: { view: OnboardingView }) {
);
}
-function Trailing({ flow, view, agents, onFinish }: { flow: OnboardingHook; view: OnboardingView; agents: AgentsStep; onFinish: () => void }) {
+function Trailing({
+ flow,
+ view,
+ agents,
+ host,
+ choice,
+ onFinish,
+}: {
+ flow: OnboardingHook;
+ view: OnboardingView;
+ agents: AgentsStep;
+ host: HostSetup;
+ choice: ModeChoice;
+ onFinish: () => void;
+}) {
const { data: session, signIn } = useSession();
const skip = view.canSkip ? (
<Button variant="ghost" size="lg" onClick={() => flow.send({ type: "signin-done" })}>
@@ -530,8 +597,8 @@ function Trailing({ flow, view, agents, onFinish }: { flow: OnboardingHook; view
</Button>
);
case "mode":
- // The choices are the buttons.
- return null;
+ // The cards select; Continue (and Return) moves on.
+ return <ModeContinue view={view} host={host} choice={choice} />;
case "done":
return (
<Button size="lg" data-onboarding-primary="" onClick={onFinish}>
diff --git a/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx b/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx
index f4a91b33ee..3d136a7849 100644
--- a/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx
+++ b/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx
@@ -165,7 +165,7 @@ describe("ThisMachinePanel: a spare machine", () => {
expect(screen.getByRole("switch", { name: /Provide Spaces/ })).toBeChecked();
// Both may be off (sharing then stops), so the only one on can go off.
expect(screen.getByRole("switch", { name: /Provide Spaces/ })).not.toBeDisabled();
- expect(screen.getByText(/2 macOS VMs \(Apple’s license allows two per Mac\)/)).toBeInTheDocument();
+ expect(screen.getByText(/Up to 4 Spaces · 2 macOS VMs$/)).toBeInTheDocument();
expect(screen.getByText("None yet")).toBeInTheDocument();
// No desktop, so no screen permissions to grant.
expect(screen.queryByText("Screen Recording")).toBeNull();
diff --git a/docs/content/docs/cua-sdk/reference/spaces/app-core/about.mdx b/docs/content/docs/cua-sdk/reference/spaces/app-core/about.mdx
index 17f694e030..6947cb568d 100644
--- a/docs/content/docs/cua-sdk/reference/spaces/app-core/about.mdx
+++ b/docs/content/docs/cua-sdk/reference/spaces/app-core/about.mdx
@@ -268,9 +268,9 @@ Returned by [`app_about_input_from_json`](#app_about_input_from_json).
| Field | Type | Default | Description |
| --- | --- | --- | --- |
-| `auto_check_label` / `autoCheckLabel` | `String` | | "Automatically check for updates". |
+| `auto_check_label` / `autoCheckLabel` | `String` | | "Check for and download updates automatically". |
| `auto_check` / `autoCheck` | `bool` | | Checked. |
-| `auto_install_label` / `autoInstallLabel` | `String` | | "Install updates automatically". |
+| `auto_install_label` / `autoInstallLabel` | `String` | | "Install a downloaded update when Cua Spaces quits". |
| `auto_install` / `autoInstall` | `bool` | | Checked. |
| `auto_install_enabled` / `autoInstallEnabled` | `bool` | | It can be used (only with automatic checks). |
| `channel_label` / `channelLabel` | `String` | | "Update to:". |
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/about.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/about.json
index 48a4f47ffb..1edb93a588 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/about.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/about.json
@@ -12,8 +12,8 @@
],
"title": "Cua Spaces for macOS",
"updates": {
- "autoCheck": "[x] Automatically check for updates",
- "autoInstall": "[ ] Install updates automatically",
+ "autoCheck": "[x] Check for and download updates automatically",
+ "autoInstall": "[ ] Install a downloaded update when Cua Spaces quits",
"channel": "Update to: Stable* | Beta",
"check": "Check Now on",
"help": "Stable gets tested releases. Beta also gets prereleases: new features sooner, with rough edges. Back on Stable, this version stays until a newer stable release.",
@@ -35,8 +35,8 @@
],
"title": "Cua Spaces for macOS",
"updates": {
- "autoCheck": "[x] Automatically check for updates",
- "autoInstall": "[x] Install updates automatically",
+ "autoCheck": "[x] Check for and download updates automatically",
+ "autoInstall": "[x] Install a downloaded update when Cua Spaces quits",
"channel": "Update to: Stable* | Beta",
"check": "Check Now on",
"help": "Stable gets tested releases. Beta also gets prereleases: new features sooner, with rough edges. Back on Stable, this version stays until a newer stable release.",
@@ -58,8 +58,8 @@
],
"title": "Cua Spaces for macOS",
"updates": {
- "autoCheck": "[x] Automatically check for updates",
- "autoInstall": "[x] Install updates automatically",
+ "autoCheck": "[x] Check for and download updates automatically",
+ "autoInstall": "[x] Install a downloaded update when Cua Spaces quits",
"channel": "Update to: Stable | Beta*",
"check": "Check Now on",
"help": "Stable gets tested releases. Beta also gets prereleases: new features sooner, with rough edges. Back on Stable, this version stays until a newer stable release.",
@@ -83,8 +83,8 @@
],
"title": "Cua Spaces for macOS",
"updates": {
- "autoCheck": "[x] Automatically check for updates",
- "autoInstall": "[x] Install updates automatically",
+ "autoCheck": "[x] Check for and download updates automatically",
+ "autoInstall": "[x] Install a downloaded update when Cua Spaces quits",
"channel": "Update to: Stable | Beta*",
"check": "Checking… off",
"help": "Stable gets tested releases. Beta also gets prereleases: new features sooner, with rough edges. Back on Stable, this version stays until a newer stable release.",
@@ -108,8 +108,8 @@
],
"title": "Cua Spaces for macOS",
"updates": {
- "autoCheck": "[ ] Automatically check for updates",
- "autoInstall": "[x] Install updates automatically (disabled)",
+ "autoCheck": "[ ] Check for and download updates automatically",
+ "autoInstall": "[x] Install a downloaded update when Cua Spaces quits (disabled)",
"channel": "Update to: Stable | Beta*",
"check": "Check Now on",
"help": "Stable gets tested releases. Beta also gets prereleases: new features sooner, with rough edges. Back on Stable, this version stays until a newer stable release.",
diff --git a/libs/cua/crates/cua-spaces-app-core/src/about.rs b/libs/cua/crates/cua-spaces-app-core/src/about.rs
index 9d7f45c6e0..a95278e2da 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/about.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/about.rs
@@ -123,11 +123,11 @@ pub struct AboutLink {
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct AboutUpdates {
- /// "Automatically check for updates".
+ /// "Check for and download updates automatically".
pub auto_check_label: String,
/// Checked.
pub auto_check: bool,
- /// "Install updates automatically".
+ /// "Install a downloaded update when Cua Spaces quits".
pub auto_install_label: String,
/// Checked.
pub auto_install: bool,
@@ -218,9 +218,9 @@ pub fn view(input: &AboutInput) -> AboutView {
url,
};
let updates = input.updater.then(|| AboutUpdates {
- auto_check_label: "Automatically check for updates".into(),
+ auto_check_label: "Check for and download updates automatically".into(),
auto_check: input.auto_check,
- auto_install_label: "Install updates automatically".into(),
+ auto_install_label: "Install a downloaded update when Cua Spaces quits".into(),
auto_install: input.auto_install,
auto_install_enabled: input.auto_check,
channel_label: "Update to:".into(),
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 bd70a56265..e4472094bb 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/host.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/host.rs
@@ -1347,7 +1347,8 @@ pub const OTHER_ACCOUNT_NOTICE: &str = "This Mac is shared with another Cua \
account, so sharing stays paused. Remove the host setup, then set it up again \
to share it with yours.";
-/// "Up to 4 Spaces · 2 macOS VMs (Apple's license allows two per Mac)".
+/// "Up to 4 Spaces · 2 macOS VMs". The macOS part is for a Mac: a shell on
+/// another system drops it (the web UI's `limitsFor`).
pub fn limits_line(max_spaces: u32, max_macos_vms: u32) -> String {
let spaces = if max_spaces == 0 {
"No Space limit".to_string()
@@ -1361,7 +1362,7 @@ pub fn limits_line(max_spaces: u32, max_macos_vms: u32) -> String {
return spaces;
}
format!(
- "{spaces} \u{b7} {max_macos_vms} macOS VM{} (Apple\u{2019}s license allows two per Mac)",
+ "{spaces} \u{b7} {max_macos_vms} macOS VM{}",
if max_macos_vms == 1 { "" } else { "s" }
)
}
@@ -2402,7 +2403,7 @@ mod tests {
assert!(v.permissions.is_empty() && v.permissions_title.is_none());
assert_eq!(
v.limits.as_deref(),
- Some("Up to 4 Spaces \u{b7} 2 macOS VMs (Apple\u{2019}s license allows two per Mac)")
+ Some("Up to 4 Spaces \u{b7} 2 macOS VMs")
);
assert_eq!(v.provided_empty.as_deref(), Some("None yet"));
diff --git a/libs/cua/crates/cua-spaces-ffi/src/app_core_types.rs b/libs/cua/crates/cua-spaces-ffi/src/app_core_types.rs
index 2ac8326192..b2418e69d9 100644
--- a/libs/cua/crates/cua-spaces-ffi/src/app_core_types.rs
+++ b/libs/cua/crates/cua-spaces-ffi/src/app_core_types.rs
@@ -6271,11 +6271,11 @@ pub struct AppAboutLink {
pub type AppAboutUpdates = core::about::AboutUpdates;
#[uniffi::remote(Record)]
pub struct AppAboutUpdates {
- /// "Automatically check for updates".
+ /// "Check for and download updates automatically".
pub auto_check_label: String,
/// Checked.
pub auto_check: bool,
- /// "Install updates automatically".
+ /// "Install a downloaded update when Cua Spaces quits".
pub auto_install_label: String,
/// Checked.
pub auto_install: bool,
diff --git a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
index 3f7ab19bf2..dbcd565cd6 100644
--- a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
+++ b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
@@ -3164,7 +3164,7 @@ public func FfiConverterTypeAppAboutLink_lower(_ value: AppAboutLink) -> RustBuf
public struct AppAboutUpdates: Equatable, Hashable {
/**
- * "Automatically check for updates".
+ * "Check for and download updates automatically".
*/
public var autoCheckLabel: String
/**
@@ -3172,7 +3172,7 @@ public struct AppAboutUpdates: Equatable, Hashable {
*/
public var autoCheck: Bool
/**
- * "Install updates automatically".
+ * "Install a downloaded update when Cua Spaces quits".
*/
public var autoInstallLabel: String
/**
@@ -3212,13 +3212,13 @@ public struct AppAboutUpdates: Equatable, Hashable {
// declare one manually.
public init(
/**
- * "Automatically check for updates".
+ * "Check for and download updates automatically".
*/autoCheckLabel: String,
/**
* Checked.
*/autoCheck: Bool,
/**
- * "Install updates automatically".
+ * "Install a downloaded update when Cua Spaces quits".
*/autoInstallLabel: String,
/**
* Checked.