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.

Spaces: delete the dead experiments and the upsell_cards flag (CUA-3508) (#6547)

cua-agents[bot]c5584a2b414e
diff --git a/apps/cua-spaces-desktop/src/bridge/settings.ts b/apps/cua-spaces-desktop/src/bridge/settings.ts
index 5482229607..b7f95328a2 100644
--- a/apps/cua-spaces-desktop/src/bridge/settings.ts
+++ b/apps/cua-spaces-desktop/src/bridge/settings.ts
@@ -88,12 +88,8 @@ export function settingsPage(model: AppModel, parts: HostParts) {
return model.native.appSettingsWithStorage(page, parts.storage.section, model.settings.experiments);
}
-/** The SwiftUI app's New UI switch ("Use classic UI", and the older `experiment:web_ui`): this app is the web UI, so it (and its note) is not offered here. */
-export const WEB_UI_ROWS = new Set(["experiment:classic_ui", "experiment:classic_ui-note", "experiment:web_ui", "experiment:web_ui-note"]);
-
export function experimentsPage(model: AppModel) {
- const page = model.native.appExperimentsPage(model.settings.experiments);
- return { ...page, sections: page.sections.map((s) => ({ ...s, rows: s.rows.filter((r) => !WEB_UI_ROWS.has(r.id)) })) };
+ return model.native.appExperimentsPage(model.settings.experiments);
}
/** The experiments the daemon enforces (Secure Spaces, Child Spaces, Ask first, CI runners, Public TCP shares, Phone app, Warm start) as the cua home keeps them: what `cua experiments enable` set shows the next time Settings is read. */
@@ -310,7 +306,6 @@ export function settingsMethods(ctx: BridgeContext): Handlers {
if (!updates.updater) throw Failure.unsupported("Updates are off in this build");
updates.choose(option);
} else if (row.startsWith("experiment:")) {
- if (WEB_UI_ROWS.has(row)) throw Failure.unsupported("This app is the new UI");
chooseExperiment(model, row, option);
} else if (row.startsWith("agent:")) {
// An AI agents row: configure it, or remove what cua added.
diff --git a/apps/cua-spaces-desktop/src/model/app-model.ts b/apps/cua-spaces-desktop/src/model/app-model.ts
index 580be263a1..05725f0228 100644
--- a/apps/cua-spaces-desktop/src/model/app-model.ts
+++ b/apps/cua-spaces-desktop/src/model/app-model.ts
@@ -432,7 +432,7 @@ export class AppModel {
/** The detail as this machine sees it (`appSpaceDetailFor`). */
detail(space: AppSpace): AppSpaceDetail {
- return this.native.appSpaceDetailFor(space, this.usage.get(space.id), this.hostArch, this.settings.experiments, this.devices.accessNotice);
+ return this.native.appSpaceDetailFor(space, this.usage.get(space.id), this.hostArch, this.devices.accessNotice);
}
/** The Spaces whose desktop can be shown (running and reachable). */
diff --git a/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi-ffi.ts b/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi-ffi.ts
index 2be5f706ed..534399a30c 100644
--- a/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi-ffi.ts
+++ b/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi-ffi.ts
@@ -1477,11 +1477,6 @@ const DEFINITIONS = {
ret: FfiType.RustBuffer,
hasRustCallStatus: true,
},
- "uniffi_cua_spaces_ffi_fn_func_app_settings_resolve_new_ui": {
- args: [FfiType.RustBuffer, FfiType.RustBuffer],
- ret: FfiType.RustBuffer,
- hasRustCallStatus: true,
- },
"uniffi_cua_spaces_ffi_fn_func_app_settings_save": {
args: [FfiType.RustBuffer, FfiType.RustBuffer],
ret: FfiType.Void,
@@ -1578,7 +1573,7 @@ const DEFINITIONS = {
hasRustCallStatus: true,
},
"uniffi_cua_spaces_ffi_fn_func_app_space_detail_for": {
- args: [FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer],
+ args: [FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer],
ret: FfiType.RustBuffer,
hasRustCallStatus: true,
},
@@ -1587,11 +1582,6 @@ const DEFINITIONS = {
ret: FfiType.RustBuffer,
hasRustCallStatus: true,
},
- "uniffi_cua_spaces_ffi_fn_func_app_space_detail_with": {
- args: [FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer, FfiType.RustBuffer],
- ret: FfiType.RustBuffer,
- hasRustCallStatus: true,
- },
"uniffi_cua_spaces_ffi_fn_func_app_space_host": {
args: [FfiType.RustBuffer],
ret: FfiType.RustBuffer,
@@ -3412,11 +3402,6 @@ const DEFINITIONS = {
ret: FfiType.UInt16,
hasRustCallStatus: false,
},
- "uniffi_cua_spaces_ffi_checksum_func_app_settings_resolve_new_ui": {
- args: [],
- ret: FfiType.UInt16,
- hasRustCallStatus: false,
- },
"uniffi_cua_spaces_ffi_checksum_func_app_settings_save": {
args: [],
ret: FfiType.UInt16,
@@ -3522,11 +3507,6 @@ const DEFINITIONS = {
ret: FfiType.UInt16,
hasRustCallStatus: false,
},
- "uniffi_cua_spaces_ffi_checksum_func_app_space_detail_with": {
- args: [],
- ret: FfiType.UInt16,
- hasRustCallStatus: false,
- },
"uniffi_cua_spaces_ffi_checksum_func_app_space_host": {
args: [],
ret: FfiType.UInt16,
@@ -4671,7 +4651,6 @@ interface NativeModuleInterface {
uniffi_cua_spaces_ffi_fn_func_app_settings_input_from_json(json: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_settings_load(path: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_settings_page(input: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
- uniffi_cua_spaces_ffi_fn_func_app_settings_resolve_new_ui(settings: Uint8Array, version: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_settings_save(path: Uint8Array, settings: Uint8Array, uniffi_out_err: UniffiRustCallStatus): void;
uniffi_cua_spaces_ffi_fn_func_app_settings_with_storage(page: Uint8Array, storage: Uint8Array, experiments: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_share_action_from_json(json: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
@@ -4691,9 +4670,8 @@ interface NativeModuleInterface {
uniffi_cua_spaces_ffi_fn_func_app_space_accepts_drop(space: Uint8Array, uniffi_out_err: UniffiRustCallStatus): number;
uniffi_cua_spaces_ffi_fn_func_app_space_detail(space: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_space_detail_copy(uniffi_out_err: UniffiRustCallStatus): Uint8Array;
- uniffi_cua_spaces_ffi_fn_func_app_space_detail_for(space: Uint8Array, usage: Uint8Array, hostArch: Uint8Array, experiments: Uint8Array, access: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
+ uniffi_cua_spaces_ffi_fn_func_app_space_detail_for(space: Uint8Array, usage: Uint8Array, hostArch: Uint8Array, access: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_space_detail_live(space: Uint8Array, usage: Uint8Array, hostArch: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
- uniffi_cua_spaces_ffi_fn_func_app_space_detail_with(space: Uint8Array, usage: Uint8Array, hostArch: Uint8Array, experiments: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_space_host(host: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_space_menu(input: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
uniffi_cua_spaces_ffi_fn_func_app_space_menu_input_from_json(json: Uint8Array, uniffi_out_err: UniffiRustCallStatus): Uint8Array;
@@ -5058,7 +5036,6 @@ interface NativeModuleInterface {
uniffi_cua_spaces_ffi_checksum_func_app_settings_input_from_json(): number;
uniffi_cua_spaces_ffi_checksum_func_app_settings_load(): number;
uniffi_cua_spaces_ffi_checksum_func_app_settings_page(): number;
- uniffi_cua_spaces_ffi_checksum_func_app_settings_resolve_new_ui(): number;
uniffi_cua_spaces_ffi_checksum_func_app_settings_save(): number;
uniffi_cua_spaces_ffi_checksum_func_app_settings_with_storage(): number;
uniffi_cua_spaces_ffi_checksum_func_app_share_action_from_json(): number;
@@ -5080,7 +5057,6 @@ interface NativeModuleInterface {
uniffi_cua_spaces_ffi_checksum_func_app_space_detail_copy(): number;
uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for(): number;
uniffi_cua_spaces_ffi_checksum_func_app_space_detail_live(): number;
- uniffi_cua_spaces_ffi_checksum_func_app_space_detail_with(): number;
uniffi_cua_spaces_ffi_checksum_func_app_space_host(): number;
uniffi_cua_spaces_ffi_checksum_func_app_space_menu(): number;
uniffi_cua_spaces_ffi_checksum_func_app_space_menu_input_from_json(): number;
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 4bab5d2add..0521064d4e 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
@@ -4586,29 +4586,6 @@ export function appSettingsPage(input: AppSettingsInput): AppSettingsPage {
));
}
-/**
- * The settings with the New UI as a launch of `version` shows it: the
- * user's choice, else the default for the update channel and version
- * (again after the channel changes).
- */
-export function appSettingsResolveNewUi(settings: AppSettings, version: string): AppSettings {
- return ((__rb: Uint8Array) => {
- try {
- return FfiConverterTypeAppSettings.lift(__rb);
- } finally {
- nativeModule().rustbuffer_free(__rb);
- }
- })(uniffiCaller.rustCall(
- /*caller:*/ (callStatus) => {
- return nativeModule().uniffi_cua_spaces_ffi_fn_func_app_settings_resolve_new_ui(
- FfiConverterTypeAppSettings.lower(settings, nativeModule().rustbuffer_alloc),
- FfiConverterString.lower(version, nativeModule().rustbuffer_alloc),
- callStatus);
- },
- /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
- ));
- }
-
/**
* Writes the settings file, and keeps the experiments the daemon enforces
* where it reads them (the cua home).
@@ -5012,13 +4989,13 @@ export function appSpaceDetailCopy(): AppDetailCopy {
}
/**
- * [`app_space_detail_with`] as this device sees it: `access` (from
+ * [`app_space_detail_live`] as this device sees it: `access` (from
* [`app_machine_access_notice`]) greys out Connect on every Space reached
* through the relay while this device is not enrolled; one of your
* machines that does not share its desktop shows its note in place of the
* desktop, Stream, Agents and Teleport.
*/
-export function appSpaceDetailFor(space: AppSpace, usage: AppSpaceUsage | undefined, hostArch: string | undefined, experiments: AppExperiments, access: AppMachineAccessNotice | undefined): AppSpaceDetail {
+export function appSpaceDetailFor(space: AppSpace, usage: AppSpaceUsage | undefined, hostArch: string | undefined, access: AppMachineAccessNotice | undefined): AppSpaceDetail {
return ((__rb: Uint8Array) => {
try {
return FfiConverterTypeAppSpaceDetail.lift(__rb);
@@ -5031,7 +5008,6 @@ export function appSpaceDetailFor(space: AppSpace, usage: AppSpaceUsage | undefi
FfiConverterTypeAppSpace.lower(space, nativeModule().rustbuffer_alloc),
FfiConverterOptionalTypeAppSpaceUsage.lower(usage, nativeModule().rustbuffer_alloc),
FfiConverterOptionalString.lower(hostArch, nativeModule().rustbuffer_alloc),
- FfiConverterTypeAppExperiments.lower(experiments, nativeModule().rustbuffer_alloc),
FfiConverterOptionalTypeAppMachineAccessNotice.lower(access, nativeModule().rustbuffer_alloc),
callStatus);
},
@@ -5064,30 +5040,6 @@ export function appSpaceDetailLive(space: AppSpace, usage: AppSpaceUsage | undef
));
}
-/**
- * [`app_space_detail_live`] without what Settings, Experiments hides (the
- * Share button while Sharing is off).
- */
-export function appSpaceDetailWith(space: AppSpace, usage: AppSpaceUsage | undefined, hostArch: string | undefined, experiments: AppExperiments): AppSpaceDetail {
- return ((__rb: Uint8Array) => {
- try {
- return FfiConverterTypeAppSpaceDetail.lift(__rb);
- } finally {
- nativeModule().rustbuffer_free(__rb);
- }
- })(uniffiCaller.rustCall(
- /*caller:*/ (callStatus) => {
- return nativeModule().uniffi_cua_spaces_ffi_fn_func_app_space_detail_with(
- FfiConverterTypeAppSpace.lower(space, nativeModule().rustbuffer_alloc),
- FfiConverterOptionalTypeAppSpaceUsage.lower(usage, nativeModule().rustbuffer_alloc),
- FfiConverterOptionalString.lower(hostArch, nativeModule().rustbuffer_alloc),
- FfiConverterTypeAppExperiments.lower(experiments, nativeModule().rustbuffer_alloc),
- callStatus);
- },
- /*liftString:*/ FfiConverterString.lift.bind(FfiConverterString),
- ));
- }
-
/**
* One of your machines that provides Spaces (the SDK's `Spaces.hosts()`)
* as the wizard reads it.
@@ -14616,20 +14568,6 @@ export type AppExperiments = {
* Cua Volume in the first run and Settings, Storage.
*/
cuaVolume: boolean,
- /**
- * Your own clouds in the New Space wizard.
- */
- yourCloud: boolean,
- /**
- * Sharing a Space with other accounts. On unless turned off: a missing
- * key reads as on (the plans on cua.ai/pricing list sharing).
- */
- sharing: boolean,
- /**
- * The shared web UI is the main window. Always on in the macOS shell
- * ([`crate::settings::resolve_new_ui`]); kept for older files and builds.
- */
- webUi: boolean,
/**
* Secure Spaces: a Space reaches the internet and nothing else on the
* network unless it is opened. Off unless turned on; the daemon enforces
@@ -14695,9 +14633,6 @@ const FfiConverterTypeAppExperiments = (() => {
read(from: RustBuffer): TypeName {
return {
cuaVolume: FfiConverterBool.read(from),
- yourCloud: FfiConverterBool.read(from),
- sharing: FfiConverterBool.read(from),
- webUi: FfiConverterBool.read(from),
secureSpaces: FfiConverterBool.read(from),
childSpaces: FfiConverterBool.read(from),
askFirst: FfiConverterBool.read(from),
@@ -14709,9 +14644,6 @@ const FfiConverterTypeAppExperiments = (() => {
}
write(value: TypeName, into: RustBuffer): void {
FfiConverterBool.write(value.cuaVolume, into);
- FfiConverterBool.write(value.yourCloud, into);
- FfiConverterBool.write(value.sharing, into);
- FfiConverterBool.write(value.webUi, into);
FfiConverterBool.write(value.secureSpaces, into);
FfiConverterBool.write(value.childSpaces, into);
FfiConverterBool.write(value.askFirst, into);
@@ -14722,9 +14654,6 @@ const FfiConverterTypeAppExperiments = (() => {
}
allocationSize(value: TypeName): number {
return FfiConverterBool.allocationSize(value.cuaVolume) +
- FfiConverterBool.allocationSize(value.yourCloud) +
- FfiConverterBool.allocationSize(value.sharing) +
- FfiConverterBool.allocationSize(value.webUi) +
FfiConverterBool.allocationSize(value.secureSpaces) +
FfiConverterBool.allocationSize(value.childSpaces) +
FfiConverterBool.allocationSize(value.askFirst) +
@@ -40896,18 +40825,9 @@ export type AppSettings = {
launchAtLogin?: boolean,
/**
* Settings, Experiments: every switch off unless turned on
- * ([`crate::experiments`]). Its `webUi` is always on in the macOS
- * shell ([`resolve_new_ui`]); the file keeps only [`Self::new_ui`]'s
- * "on" there, the value older builds read.
+ * ([`crate::experiments`]).
*/
experiments: AppExperiments,
- /**
- * The New UI as an older build's "Use classic UI" saved it. Read and
- * kept for those builds, never acted on: the web UI is the only UI
- * ([`resolve_new_ui`]). An older build's saved `webUi: true` reads as
- * `Some(true)`; its `false` was only the saved default ([`load`]).
- */
- newUi?: boolean,
/**
* Keyvault copies (import ids) the user dismissed from the notch: it no
* longer shows them, nothing is revoked or wiped
@@ -41000,7 +40920,6 @@ const FfiConverterTypeAppSettings = (() => {
updateChannel: FfiConverterTypeAppUpdateChannel.read(from),
launchAtLogin: FfiConverterOptionalBoolean.read(from),
experiments: FfiConverterTypeAppExperiments.read(from),
- newUi: FfiConverterOptionalBoolean.read(from),
dismissedAccess: FfiConverterSequenceString.read(from),
notchPinned: FfiConverterSequenceString.read(from),
keyvaultSiteIcons: FfiConverterBool.read(from),
@@ -41024,7 +40943,6 @@ const FfiConverterTypeAppSettings = (() => {
FfiConverterTypeAppUpdateChannel.write(value.updateChannel, into);
FfiConverterOptionalBoolean.write(value.launchAtLogin, into);
FfiConverterTypeAppExperiments.write(value.experiments, into);
- FfiConverterOptionalBoolean.write(value.newUi, into);
FfiConverterSequenceString.write(value.dismissedAccess, into);
FfiConverterSequenceString.write(value.notchPinned, into);
FfiConverterBool.write(value.keyvaultSiteIcons, into);
@@ -41047,7 +40965,6 @@ const FfiConverterTypeAppSettings = (() => {
FfiConverterTypeAppUpdateChannel.allocationSize(value.updateChannel) +
FfiConverterOptionalBoolean.allocationSize(value.launchAtLogin) +
FfiConverterTypeAppExperiments.allocationSize(value.experiments) +
- FfiConverterOptionalBoolean.allocationSize(value.newUi) +
FfiConverterSequenceString.allocationSize(value.dismissedAccess) +
FfiConverterSequenceString.allocationSize(value.notchPinned) +
FfiConverterBool.allocationSize(value.keyvaultSiteIcons) +
@@ -46302,7 +46219,7 @@ export type AppWizardEnv = {
storage?: AppLocalStorage,
/**
* The user's connected clouds (`cloud_status`), for "Your cloud"
- * (offered only while its experiment is on: [`offered_clouds`]).
+ * ([`offered_clouds`]).
*/
clouds: Array<AppConnectedCloud>,
/**
@@ -46310,7 +46227,7 @@ export type AppWizardEnv = {
*/
hosts: Array<AppSpaceHost>,
/**
- * Settings, Experiments ("Your cloud" decides whether clouds show).
+ * Settings, Experiments (the daemon-enforced switches the wizard reads).
*/
experiments: AppExperiments,
/**
@@ -71923,9 +71840,6 @@ function uniffiEnsureInitialized() {
if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_settings_page() !== 454) {
throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_settings_page");
}
- if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_settings_resolve_new_ui() !== 48081) {
- throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_settings_resolve_new_ui");
- }
if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_settings_save() !== 62204) {
throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_settings_save");
}
@@ -71983,15 +71897,12 @@ function uniffiEnsureInitialized() {
if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_space_detail_copy() !== 55740) {
throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_space_detail_copy");
}
- if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for() !== 46982) {
+ if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for() !== 50402) {
throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for");
}
if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_space_detail_live() !== 55583) {
throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_space_detail_live");
}
- if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_space_detail_with() !== 51134) {
- throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_space_detail_with");
- }
if (nativeModule().uniffi_cua_spaces_ffi_checksum_func_app_space_host() !== 37974) {
throw new UniffiInternalError.ApiChecksumMismatch("uniffi_cua_spaces_ffi_checksum_func_app_space_host");
}
diff --git a/apps/cua-spaces-desktop/test/host-bridge.test.ts b/apps/cua-spaces-desktop/test/host-bridge.test.ts
index 2df39e2c1a..880bad1342 100644
--- a/apps/cua-spaces-desktop/test/host-bridge.test.ts
+++ b/apps/cua-spaces-desktop/test/host-bridge.test.ts
@@ -630,14 +630,11 @@ describe.skipIf(!built)("This machine, Devices and Settings on the app core", ()
expect(model.settings.tips).toEqual({ off: false, done: [] });
});
- it("offers every experiment but the New UI switch (Use classic UI), which this app is", async () => {
+ it("offers every experiment, and none of the switches that are gone", async () => {
const s = (await call("settings.get")) as { experiments: { sections: { rows: { id: string }[] }[] } };
const rows = s.experiments.sections.flatMap((x) => x.rows.map((r) => r.id));
- expect(rows).toEqual(expect.arrayContaining(["experiment:cua_volume", "experiment:your_cloud", "experiment:sharing"]));
- expect(rows).not.toContain("experiment:web_ui");
- expect(rows).not.toContain("experiment:classic_ui");
- expect(await code("settings.choose", { row: "experiment:web_ui", option: "off" })).toBe("unsupported");
- expect(await code("settings.choose", { row: "experiment:classic_ui", option: "on" })).toBe("unsupported");
+ expect(rows).toEqual(expect.arrayContaining(["experiment:cua_volume", "experiment:secure_spaces", "experiment:warm_pools"]));
+ for (const gone of ["your_cloud", "sharing", "web_ui", "classic_ui"]) expect(rows).not.toContain(`experiment:${gone}`);
});
it("New Space's \u201cUse built-in Lume\u201d and Settings' kind rows write the per-kind runtime settings", async () => {
diff --git a/apps/cua-spaces-macos/README.md b/apps/cua-spaces-macos/README.md
index 1dd730c5bb..626d860ba4 100644
--- a/apps/cua-spaces-macos/README.md
+++ b/apps/cua-spaces-macos/README.md
@@ -122,9 +122,7 @@ Started, ⌘⇧Space and the app's notifications (a Space that came up: its page
a machine asking to be added: Machines; an agent: Agents). A Space's
desktop opens in its own native window (video stays native).
-There is no native main window and no switch back: the "Use classic UI"
-setting is gone. An install that had it on (`AppSettings.new_ui` false) opens
-the web UI like every other one (`settings::resolve_new_ui` is always on).
+There is no native main window and no switch back.
- Release: `scripts/build-app.sh` copies the web build (`apps/cua-spaces-web/dist`,
or `CUA_WEBUI_DIST`) to `Contents/Resources/WebUI`, served at
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift
index 4818d6c633..97f44ef504 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift
@@ -114,8 +114,7 @@ public enum AppEnvironment {
devices: devices,
presence: fixtures ? FixturePresence() : LivePresence(),
loginItem: fixtures ? fixtureLoginItem(env["CUA_SPACES_LOGIN_ITEM"]) : MainAppLoginItem(),
- startup: startup,
- appVersion: fixtures ? nil : info.version)
+ startup: startup)
if fixtures { model.teamsReader = FixtureTeams() }
if !fixtures {
// Local Network access is asked for before the first macOS
@@ -471,9 +470,7 @@ public enum AppEnvironment {
WebUIWindowController.show(model: model)
WebUIWindowController.startVideoHarness(model: model)
case "new-space", "new-space-picker", "new-space-resources":
- // The web wizard (`CUA_SPACES_WIZARD_ON=yours`: Your cloud's
- // experiment on for this run, and "Run on" there).
- if env["CUA_SPACES_WIZARD_ON"] == "yours" { model.settings.experiments.yourCloud = true }
+ // The web wizard (`CUA_SPACES_WIZARD_ON=yours`: "Run on" there).
WebUIWindowController.showNewSpace(model: model, on: env["CUA_SPACES_WIZARD_ON"])
case "keyvault", "keyvault-waiting":
web(.keyvault)
diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift
index 3033e69906..1be7d60d5e 100644
--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift
+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift
@@ -183,10 +183,6 @@ public final class AppModel {
public let pageDropTargets = SidebarDropTargets()
public var settings: AppSettings
let settingsPath: String
- /// The running app's version: with it, the New UI's default follows
- /// the update channel and the version (`appSettingsResolveNewUi`);
- /// without it (tests, fixtures), the New UI is on only by choice.
- let appVersion: String?
/// Settings → About and the updater (none until `AppEnvironment`
/// starts one).
public var updates = UpdatesModel(updater: nil)
@@ -197,7 +193,7 @@ public final class AppModel {
telemetry: TelemetryRunning? = nil, agentSetup: AgentSetupRunning? = nil,
devices: DevicesRunning? = nil,
presence: PresenceChecking = LivePresence(), loginItem: LoginItemControlling? = nil,
- startup: StartupModel? = nil, appVersion: String? = nil) {
+ startup: StartupModel? = nil) {
self.backend = backend
self.startup = startup ?? StartupModel()
self.devices = DevicesModel(devices: devices, presence: presence)
@@ -220,9 +216,7 @@ public final class AppModel {
self.keyvault = keyvault
self.onboarding = onboarding
self.settingsPath = settingsPath
- self.appVersion = appVersion
- var settings = appSettingsLoad(path: settingsPath)
- if let appVersion { settings = appSettingsResolveNewUi(settings: settings, version: appVersion) }
+ let settings = appSettingsLoad(path: settingsPath)
self.settings = settings
self.wizard = WizardModel(env: AppWizardEnv(
defaultLocation: settings.defaultLocation,
@@ -373,13 +367,12 @@ public final class AppModel {
access: detail.access))
}
- /// The detail without what Settings, Experiments hides (Share while
- /// Sharing is off), as this Mac sees it: a machine reached through the
+ /// The detail as this Mac sees it: a machine reached through the
/// relay has its Connect greyed out while this Mac is not enrolled, and
/// one that does not share its desktop shows why in its place.
public func detail(_ space: AppSpace) -> AppSpaceDetail {
appSpaceDetailFor(space: space, usage: usage[space.id], hostArch: Self.hostArch,
- experiments: settings.experiments, access: devices.accessNotice)
+ access: devices.accessNotice)
}
/// The Spaces one of your machines provides (its detail lists them).
@@ -2019,14 +2012,10 @@ public final class AppModel {
applyExperiments(before: before, after: after)
}
- /// Settings → About's channel, saved; with no choice of the user's, the
- /// New UI follows the channel's default at once.
+ /// Settings → About's channel, saved.
public func setUpdateChannel(_ channel: AppUpdateChannel) {
settings.updateChannel = channel
- let before = settings.experiments
- if let appVersion { settings = appSettingsResolveNewUi(settings: settings, version: appVersion) }
saveSettings()
- if settings.experiments != before { applyExperiments(before: before, after: settings.experiments) }
}
/// What follows a change of the switches: an open New Space.
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/FirstRunTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/FirstRunTests.swift
index 2458a94fd7..646783030b 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/FirstRunTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/FirstRunTests.swift
@@ -25,7 +25,7 @@ struct FirstRunTests {
onboarding: OnboardingModel(statePath: state.path),
settingsPath: dir.appendingPathComponent("settings.json").path, telemetry: telemetry,
loginItem: loginItem)
- model.settings.experiments = AppExperiments(cuaVolume: false, yourCloud: false, sharing: true, webUi: true, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false)
+ model.settings.experiments = AppExperiments(cuaVolume: false, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false)
let bridge = WebUIBridge(model: model, allowedOrigins: [])
bridge.notifySpaceReady = { _ in }
return (bridge, model, telemetry, state)
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/MainUIRouteTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/MainUIRouteTests.swift
index ef5427b58b..227d139097 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/MainUIRouteTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/MainUIRouteTests.swift
@@ -21,7 +21,7 @@ struct MainUIRouteTests {
onboarding: OnboardingModel(statePath: dir.appendingPathComponent("onboarding.json").path),
settingsPath: dir.appendingPathComponent("settings.json").path,
telemetry: FixtureTelemetry())
- m.settings.experiments = AppExperiments(cuaVolume: true, yourCloud: false, sharing: false, webUi: true, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false)
+ m.settings.experiments = AppExperiments(cuaVolume: true, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false)
return m
}
@@ -39,11 +39,10 @@ struct MainUIRouteTests {
#expect(MainUIRoute.home.dropped.isEmpty)
}
- /// Every route opens the web UI window, whatever an older build saved
- /// for the New UI (there is no native window to fall back to).
+ /// Every route opens the web UI window (there is no native window to
+ /// fall back to).
@Test func everyRouteOpensTheWebWindow() {
let m = model()
- m.settings.experiments.webUi = false
var web: [MainUIRoute] = []
let router = MainUIRouter(model: m, web: { web.append($0) })
router.open(.space("s1"))
@@ -159,36 +158,6 @@ struct MainUIRouteTests {
#expect(MainUIRouter.route(forNav: "nav.nope") == nil)
}
- /// An app at `version` over the settings file `json` in a fresh
- /// directory (nil: none, a fresh install).
- func launched(_ json: String?, version: String, dir: URL? = nil) -> AppModel {
- let dir = dir ?? FileManager.default.temporaryDirectory.appendingPathComponent("cua-newui-\(UUID().uuidString)")
- try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
- let path = dir.appendingPathComponent("settings.json").path
- if let json { FileManager.default.createFile(atPath: path, contents: Data(json.utf8)) }
- return AppModel(backend: FixtureSpacesBackend(), keyvault: KeyvaultModel(client: nil),
- onboarding: OnboardingModel(statePath: dir.appendingPathComponent("onboarding.json").path),
- settingsPath: path, telemetry: FixtureTelemetry(), appVersion: version)
- }
-
- /// The migration: whatever an older build saved ("Use classic UI" on, a
- /// never-chosen `webUi: false`, nothing), every launch reports the web
- /// UI, and Settings has no "Use classic UI" row to turn it off.
- @Test func everyInstallIsOnTheWebUIAndThereIsNoClassicSwitch() {
- for json in [#"{"updateChannel":"stable","newUi":false,"experiments":{"webUi":false}}"#,
- #"{"updateChannel":"beta","experiments":{"cuaVolume":true,"webUi":false}}"#,
- nil] {
- for version in ["0.8.0", "0.16.1"] {
- let m = launched(json, version: version)
- #expect(m.settings.experiments.webUi, "\(json ?? "none") \(version)")
- #expect(!m.experimentsPage.sections.flatMap(\.rows).contains { $0.id.contains("classic_ui") })
- m.chooseExperiment(row: "experiment:classic_ui", option: "on")
- m.setUpdateChannel(.stable)
- #expect(m.settings.experiments.webUi)
- }
- }
- }
-
/// A prerelease's first launch (a nightly, or a beta from before
/// Nightly) starts on Nightly; a release's on Stable; a later launch
/// keeps the channel.
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift
index 5f2268d5b7..c1775e8add 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift
@@ -2428,7 +2428,7 @@ struct ParityTests {
var env = try appWizardEnvFromJson(json: text(f["env"]))
env.experiments = x
let wizard = appWizardView(state: appWizardInitial(env: env), env: env)
- let detail = windowDetail(appSpaceDetailWith(space: space, usage: nil, hostArch: nil, experiments: x))
+ let detail = windowDetail(appSpaceDetailFor(space: space, usage: nil, hostArch: nil, access: nil))
var menuInput = try appMenuInputFromJson(json: text(f["menu"]))
menuInput.experiments = x
let chrome = appMainChrome(input: AppChromeInput(identity: nil, cloudConfigured: false, canSignIn: false,
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SettingsCommandTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SettingsCommandTests.swift
index 1a374e05f8..fce5baea73 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SettingsCommandTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SettingsCommandTests.swift
@@ -22,18 +22,15 @@ struct SettingsCommandTests {
telemetry: FixtureTelemetry())
}
- /// The classic UI too: Settings never falls back to a native window.
- @Test func settingsIsThePagesWithNewUIOnOrOff() {
- for webUi in [true, false] {
- let m = model()
- m.settings.experiments.webUi = webUi
- var web: [MainUIRoute] = [], settings: [MainUIRoute] = []
- let router = MainUIRouter(model: m, web: { web.append($0) }, settings: { settings.append($0) })
- router.openSettings()
- router.openSettings(.path("/settings/connectors"))
- #expect(settings == [.settings, .path("/settings/connectors")], "webUi \(webUi)")
- #expect(web.isEmpty)
- }
+ /// Settings never falls back to a native window.
+ @Test func settingsIsThePages() {
+ let m = model()
+ var web: [MainUIRoute] = [], settings: [MainUIRoute] = []
+ let router = MainUIRouter(model: m, web: { web.append($0) }, settings: { settings.append($0) })
+ router.openSettings()
+ router.openSettings(.path("/settings/connectors"))
+ #expect(settings == [.settings, .path("/settings/connectors")])
+ #expect(web.isEmpty)
}
/// The notch's Settings button goes through the app's hook (the router).
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SpaceMenuTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SpaceMenuTests.swift
index 65e4139b59..e4b3c6c3a6 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SpaceMenuTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SpaceMenuTests.swift
@@ -46,7 +46,6 @@ struct SpaceMenuTests {
func makeModel(_ backend: FixtureSpacesBackend = FixtureSpacesBackend(rows: SpaceMenuTests.rows)) async
-> AppModel {
let m = ViewModelTests().makeModel(backend)
- m.settings.experiments.sharing = true
await m.refresh()
return m
}
@@ -100,12 +99,6 @@ struct SpaceMenuTests {
#expect(items.first { $0.id == .teleport }?.enabled == false, "Teleport needs a running desktop")
}
- @Test func sharingOffLeavesShareOut() async throws {
- let m = await makeModel()
- m.settings.experiments.sharing = false
- #expect(!m.spaceMenu(try space(m, "local:onb-new")).contains { $0.id == .share })
- }
-
@Test func someoneElsesOffersLeaveNotDelete() async throws {
let m = await makeModel()
let items = m.spaceMenu(try space(m, "relay:sam/qa-shared"))
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
index 60d88a1467..cb557a1a9a 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift
@@ -425,19 +425,14 @@ struct ViewModelTests {
#expect(model.telemetryInput?.enabled == true)
}
- /// Settings, Experiments: every switch off except Sharing and Your cloud
- /// (on by default); Cua Volume on shows Storage after General, is saved,
+ /// Settings, Experiments: every switch off; Cua Volume on shows Storage after General, is saved,
/// recorded, and reaches the first run.
@Test func experimentsAreOffAndCuaVolumeShowsStorage() async {
let telemetry = FixtureTelemetry()
let model = makeModel(telemetry: telemetry)
let toggles = model.experimentsPage.sections.flatMap(\.rows).filter { $0.kind == .toggle }
- #expect(toggles.map(\.id) == ["experiment:cua_volume", "experiment:your_cloud", "experiment:sharing", "experiment:secure_spaces", "experiment:child_spaces", "experiment:ask_first", "experiment:ci_runners", "experiment:tcp_shares", "experiment:mobile", "experiment:warm_pools"])
- // Sharing and Your cloud are on unless turned off; no New UI row.
- let onByDefault: Set<String> = ["experiment:sharing", "experiment:your_cloud"]
- #expect(toggles.allSatisfy { r in
- r.options.first { $0.id == (onByDefault.contains(r.id) ? "on" : "off") }?.active == true
- })
+ #expect(toggles.map(\.id) == ["experiment:cua_volume", "experiment:secure_spaces", "experiment:child_spaces", "experiment:ask_first", "experiment:ci_runners", "experiment:tcp_shares", "experiment:mobile", "experiment:warm_pools"])
+ #expect(toggles.allSatisfy { r in r.options.first { $0.id == "off" }?.active == true })
#expect(!model.settingsPageWithStorage.sections.map(\.id).contains("storage"))
model.chooseExperiment(row: "experiment:cua_volume", option: "on")
#expect(model.settingsPageWithStorage.sections.map(\.id).prefix(4) == ["account", "teams", "general", "storage"])
@@ -821,10 +816,9 @@ struct ViewModelTests {
#expect(model.spaces.filter { $0.name == name }.map(\.id) == [record.id])
}
- /// Run on lists this Mac only while no cloud is connected (and with Your
- /// cloud turned off, no cloud at all), and New Space creates on this Mac.
- /// Your cloud is on by default, so "Connect a cloud" is there until it is
- /// turned off.
+ /// Run on lists this Mac only while no cloud is connected, and New Space
+ /// creates on this Mac.
+ /// "Connect a cloud" is always there.
@Test func runOnIsThisMacUntilACloudIsConnected() async {
let backend = FixtureSpacesBackend()
let model = makeModel(backend)
@@ -832,7 +826,7 @@ struct ViewModelTests {
let w = model.wizard
#expect(w.view.placements.map(\.id) == ["local"])
#expect(w.view.placementId == "local")
- #expect(w.view.fields.contains { $0.id == "connect-cloud" }, "Your cloud is on by default")
+ #expect(w.view.fields.contains { $0.id == "connect-cloud" }, "Connect a cloud is always offered")
w.send(.setPlacement(placement: .yours))
#expect(w.view.plan.placement == .local)
w.send(.next)
@@ -846,10 +840,6 @@ struct ViewModelTests {
w.send(.setPlacement(placement: .local))
w.send(.next)
#expect(w.view.price == nil, "no price on your own hardware")
-
- model.chooseExperiment(row: "experiment:your_cloud", option: "off")
- await model.openNewSpace()
- #expect(!model.wizard.view.fields.contains { $0.id == "connect-cloud" }, "Connect a cloud needs Your cloud")
}
/// Hetzner takes one masked API token: it is sent on Test and Connect
@@ -898,7 +888,6 @@ struct ViewModelTests {
@Test func connectACloudThenCreateThere() async {
let backend = FixtureSpacesBackend()
let model = makeModel(backend)
- model.chooseExperiment(row: "experiment:your_cloud", option: "on")
await model.openNewSpace()
let w = model.wizard
#expect(w.view.fields.contains { $0.id == "connect-cloud" })
@@ -1287,11 +1276,8 @@ struct ViewModelTests {
#expect(row("direct:builder")?.power == nil, "a cloud Space cannot be turned off")
let aurora = try #require(model.spaces.first { $0.id == "local:aurora" })
#expect(row(aurora.id)?.power?.help.code == "spaces.power.suspend")
- // Share before power (Sharing is on by default); none with Sharing turned off.
+ // Share before power.
#expect(model.detail(aurora).actions.map(\.id) == [.teleport, .pip, .share, .power, .delete, .open])
- model.chooseExperiment(row: "experiment:sharing", option: "off")
- #expect(model.detail(aurora).actions.map(\.id) == [.teleport, .pip, .power, .delete, .open])
- model.chooseExperiment(row: "experiment:sharing", option: "on")
model.setPower(aurora, on: false)
// Synchronously, before the SDK has done anything.
diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WebUIHostTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WebUIHostTests.swift
index e7a782f967..1580563178 100644
--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WebUIHostTests.swift
+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WebUIHostTests.swift
@@ -47,10 +47,10 @@ struct WebUIHostTests {
}
@Test func coreRecordsEncodeAsPlainValues() {
- let x = AppExperiments(cuaVolume: true, yourCloud: false, sharing: false, webUi: true, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false)
+ let x = AppExperiments(cuaVolume: true, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false)
let v = BridgeValue.encode(x) as? [String: Any]
#expect(v?["cuaVolume"] as? Bool == true)
- #expect(v?["webUi"] as? Bool == true)
+ #expect(v?["secureSpaces"] as? Bool == false)
#expect(BridgeValue.encode(Optional<String>.none) is NSNull)
#expect(BridgeValue.encode([1, 2]) as? [Int] == [1, 2])
#expect(BridgeValue.encode(AppSignInPhase.idle) as? String == "idle")
@@ -511,13 +511,11 @@ struct WebUIHostTests {
#expect(await failure(bridge, "spaces.create", ["config": config, "pendingId": "pending:web-2"]) == "cancelled")
}
- /// New Space opens the web wizard, whatever an older build saved for
- /// the New UI.
+ /// New Space opens the web wizard.
@Test func newSpaceOpensTheWebWizard() async {
let (_, model) = bridge()
var asked: [String?] = []
model.openWebNewSpace = { on in asked.append(on); return true }
- model.settings.experiments.webUi = false
await model.openNewSpace()
await model.openNewSpace(on: "host:m1")
#expect(asked == [nil, "host:m1"])
diff --git a/apps/cua-spaces-web/.env.production b/apps/cua-spaces-web/.env.production
deleted file mode 100644
index d7b8da4c23..0000000000
--- a/apps/cua-spaces-web/.env.production
+++ /dev/null
@@ -1,3 +0,0 @@
-# Release builds ship with the Pro and Teams limit cards on (CUA-2287).
-# A device can still force the flag with localStorage cua.flag.upsell_cards = 0 or 1.
-VITE_CUA_FLAG_UPSELL_CARDS=1
diff --git a/apps/cua-spaces-web/scripts/demo-video.mjs b/apps/cua-spaces-web/scripts/demo-video.mjs
index 3a940fe624..7b7302b88d 100644
--- a/apps/cua-spaces-web/scripts/demo-video.mjs
+++ b/apps/cua-spaces-web/scripts/demo-video.mjs
@@ -126,9 +126,6 @@ try {
// turning it on later. Client-side navigation keeps that state.
await page.goto(`${base}/settings/experiments`, { waitUntil: "networkidle" });
if ((await volumeSwitch.getAttribute("aria-checked")) === "true") await volumeSwitch.click();
- // Share shows only with Settings, Experiments, Sharing on (as in the apps).
- const sharingSwitch = page.locator('[data-setting-row="experiment:sharing"] [data-slot="switch"]');
- if ((await sharingSwitch.getAttribute("aria-checked")) !== "true") await sharingSwitch.click();
await page.locator("aside, nav").getByRole("link", { name: "Spaces", exact: false }).first().click();
await page.locator("[data-space-id]").first().waitFor();
await page.mouse.move(mouse.x, mouse.y);
diff --git a/apps/cua-spaces-web/src/__tests__/flags.test.ts b/apps/cua-spaces-web/src/__tests__/flags.test.ts
index a10b8d0ce0..ee7d45fca4 100644
--- a/apps/cua-spaces-web/src/__tests__/flags.test.ts
+++ b/apps/cua-spaces-web/src/__tests__/flags.test.ts
@@ -1,12 +1,11 @@
// SPDX-License-Identifier: FSL-1.1-MIT
// Copyright (c) 2026 Cua AI, Inc.
-// Flags: defaults, overrides, and the retired `spaces_redesign` (the classic design is gone, so a
-// leftover override of it, such as a stale "0" from a test, is cleared and never read).
+// Flags: defaults, device overrides and the build's env default.
import { afterEach, describe, expect, it, vi } from "vitest";
-import { clearRetiredFlagOverrides, flagOn, setFlagOverride } from "@/bridge/flags";
+import { flagOn, setFlagOverride } from "@/bridge/flags";
afterEach(() => {
vi.unstubAllEnvs();
@@ -27,12 +26,4 @@ describe("flags", () => {
setFlagOverride("spaces_ask_first_home", true);
expect(flagOn("spaces_ask_first_home")).toBe(true);
});
-
- it("clears a stale spaces_redesign override on start, and leaves the other flags alone", () => {
- localStorage.setItem("cua.flag.spaces_redesign", "0");
- localStorage.setItem("cua.flag.spaces_ask_first_home", "1");
- clearRetiredFlagOverrides();
- expect(localStorage.getItem("cua.flag.spaces_redesign")).toBeNull();
- expect(localStorage.getItem("cua.flag.spaces_ask_first_home")).toBe("1");
- });
});
diff --git a/apps/cua-spaces-web/src/__tests__/space-detail-device.test.tsx b/apps/cua-spaces-web/src/__tests__/space-detail-device.test.tsx
index 5f4567f959..b8fe397ce0 100644
--- a/apps/cua-spaces-web/src/__tests__/space-detail-device.test.tsx
+++ b/apps/cua-spaces-web/src/__tests__/space-detail-device.test.tsx
@@ -4,7 +4,7 @@
// A Space's detail as this device sees it (the core's `sidebar::detail_for`,
// as the SwiftUI app's `AppModel.detail` draws it): a machine on the relay
// while this device is not enrolled, a machine that keeps its desktop
-// private, and Share only with Settings, Experiments, Sharing on.
+// private, and Share.
import { act, cleanup, fireEvent, screen, waitFor } from "@testing-library/react";
import { afterEach, describe, expect, it } from "vitest";
@@ -28,14 +28,13 @@ const machine = (features: string[]) => ({ id: "relay:studio", name: "Studio", p
const hosted = { id: "relay:studio/space-1", name: "Build box", provider: "relay", os: "linux", spacesdVersion: "0.6.0", features: ["desktop_stream"], reachable: true, host: "studio", hostName: "Studio" };
/** `over` is read on every answer: a test may change it while the page is open. */
-function host(rows: unknown[], over: { access?: boolean; sharing?: boolean } = {}): TestHost {
+function host(rows: unknown[], over: { access?: boolean } = {}): TestHost {
return {
failsCreates: false,
listsGhost: false,
answer: (op, out) => {
if (op === "spaces.list") return [...(out as unknown[]), ...rows];
if (op === "machines.list" && over.access) return (out as MachineRow[]).map((m) => (m.current ? { ...m, accessNotice: NOTICE } : m));
- if (op === "experiments.get") return { ...(out as object), sharing: Boolean(over.sharing) };
return out;
},
};
@@ -79,7 +78,7 @@ describe.skipIf(!wasmBuilt)("this machine's own desktop opened as a Space page (
describe.skipIf(!wasmBuilt)("a Space's detail as this device sees it (real routes, wasm core)", () => {
it("greys out a machine's Connect, Teleport and Share while this device is not enrolled, and its action opens the enroll sheet", async () => {
- const { router, hooks } = await mountApp("/spaces", host([machine(["desktop_stream", "window_stream", "host_spaces", "relay_attach"])], { access: true, sharing: true }));
+ const { router, hooks } = await mountApp("/spaces", host([machine(["desktop_stream", "window_stream", "host_spaces", "relay_attach"])], { access: true }));
await waitFor(() => expect(hooks.machines.data?.find((m) => m.current)?.accessNotice).toEqual(NOTICE));
await act(() => router.navigate({ to: "/spaces/$spaceId", params: { spaceId: "relay:studio" } }));
@@ -123,15 +122,9 @@ describe.skipIf(!wasmBuilt)("a Space's detail as this device sees it (real route
expect(screen.queryByRole("button", { name: /Teleport an app/ })).toBeNull();
});
- it("shows Share only while Settings, Experiments, Sharing is on", async () => {
- const off = await mountApp("/spaces/local:design-review", host([]));
- await off.router.load();
- await screen.findByRole("button", { name: /^Teleport an app$/ });
- expect(screen.queryByRole("button", { name: /^Share$/ })).toBeNull();
- cleanup();
-
- const on = await mountApp("/spaces/local:design-review", host([], { sharing: true }));
- await on.router.load();
+ it("shows Share", async () => {
+ const view = await mountApp("/spaces/local:design-review", host([]));
+ await view.router.load();
await screen.findByRole("button", { name: /^Share$/ });
});
});
diff --git a/apps/cua-spaces-web/src/__tests__/upsell.test.tsx b/apps/cua-spaces-web/src/__tests__/upsell.test.tsx
index eb8894a36c..a15f3bfe85 100644
--- a/apps/cua-spaces-web/src/__tests__/upsell.test.tsx
+++ b/apps/cua-spaces-web/src/__tests__/upsell.test.tsx
@@ -79,7 +79,7 @@ describe.skipIf(!wasmBuilt)("in-app Pro and Teams prompts (real routes, wasm cor
await waitFor(() => expect(features(tracked)).toContain("upsell_plan_card_click"));
});
- it("Settings shows the usage meter: Pro at 5 of 5 live sessions says so, with Upgrade to Teams", async () => {
+ it("Settings shows the usage meter: Pro at 5 of 5 live sessions gets the sessions card, with Upgrade to Teams", async () => {
const opened: string[] = [];
const { router } = await mountApp("/settings", host(idle({ plan: "pro", liveSessions: 5, liveSessionsLimit: 5, hoursUsed: 12, hoursLimit: 200 }), opened));
await router.load();
@@ -96,14 +96,15 @@ describe.skipIf(!wasmBuilt)("in-app Pro and Teams prompts (real routes, wasm cor
expect(document.body.textContent).toContain("Time away from this machine");
expect(hours.getAttribute("aria-valuenow")).toBe("12");
expect(hours.hasAttribute("data-full")).toBe(false);
- const notice = await waitFor(() => {
- const el = document.querySelector("[data-relay-allowance]");
+ const card = await waitFor(() => {
+ const el = document.querySelector("[data-relay-allowance='limit-card'] [data-upgrade-card]");
expect(el).toBeTruthy();
return el as HTMLElement;
});
- expect(notice.textContent).toContain("You're using 5 of 5 live sessions on Pro. Close one or upgrade to Teams.");
- fireEvent.click(notice.querySelector("[data-relay-upgrade]")!);
- await waitFor(() => expect(opened).toEqual(["https://app.cua.ai/buy/teams?from=app_meter"]));
+ expect(card.getAttribute("data-upgrade-card")).toBe("sessions");
+ expect(card.textContent).toContain("You're using 5 of 5 live sessions");
+ fireEvent.click(card.querySelector("[data-upgrade-cta]")!);
+ await waitFor(() => expect(opened).toEqual(["https://app.cua.ai/buy/teams?from=app_card_sessions"]));
});
it("Account on Pro has no Upgrade button, only the web account", async () => {
diff --git a/apps/cua-spaces-web/src/bridge/README.md b/apps/cua-spaces-web/src/bridge/README.md
index 31f9d5f928..2c2dfa6556 100644
--- a/apps/cua-spaces-web/src/bridge/README.md
+++ b/apps/cua-spaces-web/src/bridge/README.md
@@ -190,12 +190,11 @@ speaks it as is:
the sheet's create (`AppModel.runCreate`; the notch shows it too), with
`spaces.createProgress` events until it answers with the Space (or
`cancelled`). The app's own New Space items (⌘N, the menu bar, a machine's
- "New Space on…") send `spaces.newRequested {on}`, which opens the wizard;
- the native sheet is the fallback while New UI is off. The app's
- Settings items (⌘,, the menu bar item, the notch; New UI on or off) send
+ "New Space on…") send `spaces.newRequested {on}`, which opens the wizard.
+ The app's Settings items (⌘,, the menu bar item, the notch) send
`settings.openRequested` while the window is open, or open it at
`/settings`, and the page goes to Settings (also with no focus in its web
- view). The Mac app has no native Settings window. While New UI is on, the notch and the menu bar item send
+ view). The Mac app has no native Settings window. The notch and the menu bar item send
`route.openRequested {path}` (a Space's tile `/spaces/<id>`, with
`?dropped=[names]` for a drop on it; the list `/spaces`; Settings
`/settings`), and the page goes there.
diff --git a/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts
index 0b4cfc0721..b927ed269d 100644
--- a/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts
+++ b/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts
@@ -207,26 +207,25 @@ describe.skipIf(!wasmBuilt)("a Space's detail as this device sees it (wasm core)
it("greys out a machine's connection actions while this device is not enrolled, and leaves other Spaces alone", async () => {
const core = await testCore();
const [studio, local] = rowsToSpaces(core, [row({}), row({ id: "local:dev", name: "dev", provider: "local", os: "linux" })], 0);
- const d = spaceDetail(core, studio!, null, null, { sharing: true }, NOTICE);
+ const d = spaceDetail(core, studio!, null, null, NOTICE);
expect(d.access).toEqual(NOTICE);
expect(d.canStream).toBe(false);
expect(d.previewText).toBe(NOTICE.text);
expect(d.facts.find((f) => f.label === "Status")?.value).toBe("Waiting for approval");
expect(d.actions.filter((a) => ["teleport", "pip", "share", "open"].includes(a.id)).every((a) => !a.enabled)).toBe(true);
- expect(spaceDetail(core, local!, null, null, { sharing: true }, NOTICE).access).toBeUndefined();
+ expect(spaceDetail(core, local!, null, null, NOTICE).access).toBeUndefined();
});
- it("hides Share only while Settings, Experiments, Sharing is turned off", async () => {
+ it("always offers Share", async () => {
const core = await testCore();
const [studio] = rowsToSpaces(core, [row({})], 0);
- expect(spaceDetail(core, studio!, null, null, { sharing: false }).actions.some((a) => a.id === "share")).toBe(false);
- expect(spaceDetail(core, studio!, null, null, { sharing: true }).actions.some((a) => a.id === "share")).toBe(true);
+ expect(spaceDetail(core, studio!, null, null).actions.some((a) => a.id === "share")).toBe(true);
});
it("explains a machine that keeps its desktop private, with no button beside the note", async () => {
const core = await testCore();
const [studio] = rowsToSpaces(core, [row({ features: ["host_spaces", "files"] })], 0);
- const d = spaceDetail(core, studio!, null, null, {});
+ const d = spaceDetail(core, studio!, null, null);
expect(d.desktopNote).toBe("Studio isn\u2019t sharing its desktop. You can still create Spaces on it.");
expect(d.newSpace).toEqual({ label: "New Space on Studio\u2026", on: "host:studio" });
expect(d.sections).toEqual([]);
diff --git a/apps/cua-spaces-web/src/bridge/__tests__/experiments-defaults.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/experiments-defaults.test.ts
index d90d499085..277d04bfc2 100644
--- a/apps/cua-spaces-web/src/bridge/__tests__/experiments-defaults.test.ts
+++ b/apps/cua-spaces-web/src/bridge/__tests__/experiments-defaults.test.ts
@@ -5,10 +5,9 @@ import { describe, expect, it } from "vitest";
import { readExperiments } from "../ops/volume";
describe("stored experiments", () => {
- it("reads sharing and your cloud as on unless stored off, and the rest as off", () => {
- expect(readExperiments(undefined)).toEqual({ cuaVolume: false, yourCloud: true, sharing: true, webUi: false, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false });
- expect(readExperiments(JSON.stringify({ cuaVolume: true }))).toMatchObject({ cuaVolume: true, sharing: true });
- expect(readExperiments(JSON.stringify({ sharing: false }))).toMatchObject({ sharing: false });
- expect(readExperiments(JSON.stringify({ yourCloud: false }))).toMatchObject({ yourCloud: false });
+ it("reads every experiment as off unless stored on, and ignores keys of switches that are gone", () => {
+ expect(readExperiments(undefined)).toEqual({ cuaVolume: false, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false });
+ expect(readExperiments(JSON.stringify({ cuaVolume: true }))).toMatchObject({ cuaVolume: true });
+ expect(readExperiments(JSON.stringify({ sharing: false, yourCloud: false, webUi: true }))).toEqual(readExperiments(undefined));
});
});
diff --git a/apps/cua-spaces-web/src/bridge/adapters/demo/new-space.ts b/apps/cua-spaces-web/src/bridge/adapters/demo/new-space.ts
index 18b4f89b42..4e2ef1bbc2 100644
--- a/apps/cua-spaces-web/src/bridge/adapters/demo/new-space.ts
+++ b/apps/cua-spaces-web/src/bridge/adapters/demo/new-space.ts
@@ -49,7 +49,7 @@ export const DEMO_NEW_SPACE_OPTIONS: NewSpaceOptions = {
learnMore: "https://cua.ai/docs/lume/guides/gpu-passthrough",
},
],
- experiments: { ...NO_EXPERIMENTS, yourCloud: true },
+ experiments: { ...NO_EXPERIMENTS },
maxCpus: 10,
};
diff --git a/apps/cua-spaces-web/src/bridge/adapters/demo/volume.ts b/apps/cua-spaces-web/src/bridge/adapters/demo/volume.ts
index 7ba077061a..2f9bdf97f6 100644
--- a/apps/cua-spaces-web/src/bridge/adapters/demo/volume.ts
+++ b/apps/cua-spaces-web/src/bridge/adapters/demo/volume.ts
@@ -39,7 +39,7 @@ export interface DemoVolumeState {
export function demoVolumeState(now: number, onboarded: boolean, platform: DemoPlatform = MAC_DEMO_PLATFORM, askFirst = false, ciRunners = false): DemoVolumeState {
return {
- experiments: { cuaVolume: true, yourCloud: true, sharing: true, webUi: false, secureSpaces: false, childSpaces: false, askFirst, ciRunners, tcpShares: false, mobile: false, warmPools: false },
+ experiments: { cuaVolume: true, secureSpaces: false, childSpaces: false, askFirst, ciRunners, tcpShares: false, mobile: false, warmPools: false },
requests: [
{ id: "req-research", principal: "agent:researcher", prefix: "agents/writer/outputs/", mode: "r", reason: "Cite the launch draft in the weekly summary" },
],
diff --git a/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json b/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json
index f4562e9c7c..176850d1a8 100644
--- a/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json
+++ b/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json
@@ -2284,15 +2284,6 @@
"cuaVolume": {
"type": "boolean"
},
- "yourCloud": {
- "type": "boolean"
- },
- "sharing": {
- "type": "boolean"
- },
- "webUi": {
- "type": "boolean"
- },
"secureSpaces": {
"type": "boolean"
},
diff --git a/apps/cua-spaces-web/src/bridge/contracts/shapes.ts b/apps/cua-spaces-web/src/bridge/contracts/shapes.ts
index 6ef3a8de3c..427eb3c932 100644
--- a/apps/cua-spaces-web/src/bridge/contracts/shapes.ts
+++ b/apps/cua-spaces-web/src/bridge/contracts/shapes.ts
@@ -503,7 +503,7 @@ const SettingsShape = ref(
const ExperimentsShape = ref(
"Experiments",
- obj<Experiments>()({ cuaVolume: opt(bool), yourCloud: opt(bool), sharing: opt(bool), webUi: opt(bool), secureSpaces: opt(bool), childSpaces: opt(bool), askFirst: opt(bool), ciRunners: opt(bool), tcpShares: opt(bool), mobile: opt(bool), warmPools: opt(bool) }),
+ obj<Experiments>()({ cuaVolume: opt(bool), secureSpaces: opt(bool), childSpaces: opt(bool), askFirst: opt(bool), ciRunners: opt(bool), tcpShares: opt(bool), mobile: opt(bool), warmPools: opt(bool) }),
);
const RepoCacheShape = ref(
diff --git a/apps/cua-spaces-web/src/bridge/contracts/volume.ts b/apps/cua-spaces-web/src/bridge/contracts/volume.ts
index 232a8d5573..2161ec4a71 100644
--- a/apps/cua-spaces-web/src/bridge/contracts/volume.ts
+++ b/apps/cua-spaces-web/src/bridge/contracts/volume.ts
@@ -22,12 +22,9 @@ export type { DriveCheckInput, DriveS3Input, DriveStorageInput, DriveStorageUpda
/* ---- Experiments ----------------------------------------------------------- */
-/** `experiments::Experiments`: Settings, Experiments' switches (all off by default except sharing, on unless turned off). */
+/** `experiments::Experiments`: Settings, Experiments' switches (all off by default). */
export interface Experiments {
cuaVolume?: boolean;
- yourCloud?: boolean;
- sharing?: boolean;
- webUi?: boolean;
/** Secure Spaces: a Space reaches the internet and nothing else on the network unless opened. Off unless turned on; the daemon enforces it. */
secureSpaces?: boolean;
/** Child Spaces: a Space may make Spaces of its own. Off unless turned on; the daemon enforces it. */
@@ -43,7 +40,7 @@ export interface Experiments {
warmPools?: boolean;
}
-export const NO_EXPERIMENTS: Required<Experiments> = { cuaVolume: false, yourCloud: true, sharing: true, webUi: false, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false };
+export const NO_EXPERIMENTS: Required<Experiments> = { cuaVolume: false, secureSpaces: false, childSpaces: false, askFirst: false, ciRunners: false, tcpShares: false, mobile: false, warmPools: false };
/* ---- The daemon's answers (volume_*) ---------------------------------------- */
diff --git a/apps/cua-spaces-web/src/bridge/flags.ts b/apps/cua-spaces-web/src/bridge/flags.ts
index 03a868c0ec..89fb4c2bd9 100644
--- a/apps/cua-spaces-web/src/bridge/flags.ts
+++ b/apps/cua-spaces-web/src/bridge/flags.ts
@@ -8,9 +8,7 @@
* 1. this device's override (`localStorage` `cua.flag.<name>` = `1` or `0`),
* which is how a dev build or a tester forces one;
* 2. the build's default (`VITE_CUA_FLAG_<NAME>` = `1`);
- * 3. the remote value, when a source has set one (`setRemoteFlags`: the
- * PostHog feature-flag payload, once the shells pass it in);
- * 4. the flag's default.
+ * 3. the flag's default.
*
* A flag only decides what the UI draws. Plans and limits are enforced by the
* relay and the control plane, never by a flag.
@@ -19,7 +17,6 @@
import { useSyncExternalStore } from "react";
/**
- * - `upsell_cards`: the cards that offer Pro or Teams when a limit stops you.
* - `spaces_ask_first_home`: the "Ask first" Home experiment (CUA-2346): a
* Home page that asks what you want done, starts it on a fresh computer and
* follows it as a conversation. Settings → Advanced → Labs turns it on for
@@ -37,37 +34,17 @@ import { useSyncExternalStore } from "react";
* "in" picker starts on your default Space instead of a new Linux computer.
* Labs turns the new Home on with it.
*/
-export type FlagName = "upsell_cards" | "spaces_ask_first_home" | "spaces_new_onboarding" | "spaces_tree";
+export type FlagName = "spaces_ask_first_home" | "spaces_new_onboarding" | "spaces_tree";
-const DEFAULTS: Record<FlagName, boolean> = { upsell_cards: false, spaces_ask_first_home: false, spaces_new_onboarding: false, spaces_tree: false };
+const DEFAULTS: Record<FlagName, boolean> = { spaces_ask_first_home: false, spaces_new_onboarding: false, spaces_tree: false };
const key = (name: string) => `cua.flag.${name}`;
-/** Flags that no longer exist: a leftover override of one is cleared on start (a stale "0" kept a build on a design that is gone). */
-const RETIRED_FLAGS = ["spaces_redesign"] as const;
-
-/** Clears the stored override of every retired flag. Runs once when this module loads. */
-export function clearRetiredFlagOverrides(): void {
- try {
- for (const name of RETIRED_FLAGS) globalThis.localStorage?.removeItem(key(name));
- } catch {
- // No storage: nothing to clear.
- }
-}
-
-clearRetiredFlagOverrides();
-let remote: Partial<Record<FlagName, boolean>> = {};
const listeners = new Set<() => void>();
const notify = () => {
for (const l of [...listeners]) l();
};
-/** Takes the remote flag values (replacing the last ones). */
-export function setRemoteFlags(values: Partial<Record<FlagName, boolean>>): void {
- remote = { ...values };
- notify();
-}
-
/** Forces a flag on this device (`null` clears the override). */
export function setFlagOverride(name: FlagName, on: boolean | null): void {
try {
@@ -94,7 +71,7 @@ export function flagOn(name: FlagName): boolean {
}
if (local === "1") return true;
if (local === "0") return false;
- return envDefault(name) ?? remote[name] ?? DEFAULTS[name];
+ return envDefault(name) ?? DEFAULTS[name];
}
const subscribe = (l: () => void) => {
diff --git a/apps/cua-spaces-web/src/bridge/index.ts b/apps/cua-spaces-web/src/bridge/index.ts
index 5a8155d12c..cb3327cdbe 100644
--- a/apps/cua-spaces-web/src/bridge/index.ts
+++ b/apps/cua-spaces-web/src/bridge/index.ts
@@ -279,7 +279,7 @@ export {
type UpsellPrompt,
type UpsellSurface,
} from "./upsell";
-export { flagOn, newOnboardingOn, setFlagOverride, setRemoteFlags, useFlag, useNewOnboarding, useSpacesTree, type FlagName } from "./flags";
+export { flagOn, newOnboardingOn, setFlagOverride, useFlag, useNewOnboarding, useSpacesTree, type FlagName } from "./flags";
export type { CreateReport, ReportPart, ReportSend } from "./diagnostic-report";
export {
FIRST_RUN_POLL_MS,
diff --git a/apps/cua-spaces-web/src/bridge/ops/settings.ts b/apps/cua-spaces-web/src/bridge/ops/settings.ts
index 83a82e23d7..1cb2cac1f9 100644
--- a/apps/cua-spaces-web/src/bridge/ops/settings.ts
+++ b/apps/cua-spaces-web/src/bridge/ops/settings.ts
@@ -315,9 +315,6 @@ interface WkAppInfo {
/** The experiments' row ids (`experiments::row_id`). */
const EXPERIMENT_ROWS: Record<keyof Experiments, string> = {
cuaVolume: "experiment:cua_volume",
- yourCloud: "experiment:your_cloud",
- sharing: "experiment:sharing",
- webUi: "experiment:web_ui",
secureSpaces: "experiment:secure_spaces",
childSpaces: "experiment:child_spaces",
askFirst: "experiment:ask_first",
diff --git a/apps/cua-spaces-web/src/bridge/ops/volume.ts b/apps/cua-spaces-web/src/bridge/ops/volume.ts
index 0dc2af6bf5..5d6b0141de 100644
--- a/apps/cua-spaces-web/src/bridge/ops/volume.ts
+++ b/apps/cua-spaces-web/src/bridge/ops/volume.ts
@@ -123,15 +123,12 @@ const list = <T>(v: unknown, key: string): T[] => {
return Array.isArray(a) ? (a as T[]) : [];
};
-/** Settings, Experiments as stored in the Tauri app's UI storage; missing keys read as off (sharing: as on). */
+/** Settings, Experiments as stored in the Tauri app's UI storage; missing keys read as off. */
export function readExperiments(raw: string | undefined): Experiments {
try {
const stored = raw ? (JSON.parse(raw) as Partial<Record<keyof Experiments, unknown>>) : {};
return {
cuaVolume: stored.cuaVolume === true,
- yourCloud: stored.yourCloud !== false,
- sharing: stored.sharing !== false,
- webUi: stored.webUi === true,
secureSpaces: stored.secureSpaces === true,
childSpaces: stored.childSpaces === true,
askFirst: stored.askFirst === true,
diff --git a/apps/cua-spaces-web/src/bridge/parity.ts b/apps/cua-spaces-web/src/bridge/parity.ts
index 3fb8939956..21e4c58574 100644
--- a/apps/cua-spaces-web/src/bridge/parity.ts
+++ b/apps/cua-spaces-web/src/bridge/parity.ts
@@ -155,7 +155,7 @@ function bridgeMethods(core: CoreClient, record: (c: ParityCheckpoint) => void):
// A Space's detail (space-detail.ts).
"sidebar.detail": (a) => {
- const detail = spaceDetail(core, a.space, a.usage, a.hostArch, a.experiments);
+ const detail = spaceDetail(core, a.space, a.usage, a.hostArch);
record({ kind: "space-detail", space: a.space, usage: a.usage ?? null, hostArch: a.hostArch ?? null, detail });
return detail;
},
diff --git a/apps/cua-spaces-web/src/bridge/space-detail.ts b/apps/cua-spaces-web/src/bridge/space-detail.ts
index 9eca419466..6e2c4f4e24 100644
--- a/apps/cua-spaces-web/src/bridge/space-detail.ts
+++ b/apps/cua-spaces-web/src/bridge/space-detail.ts
@@ -19,7 +19,6 @@ import { sharesDesktop } from "./derive";
import type { MachineAccessNotice } from "./contracts/devices";
import type { SpaceAgentRun } from "./contracts/agents";
import type { Space } from "./contracts/spaces";
-import type { Experiments } from "./contracts/volume";
import type {
DesktopCover,
DesktopCoverInput,
@@ -57,13 +56,11 @@ export function spaceDetail(
space: Space,
usage?: SpaceUsage | null,
hostArch?: string | null,
- /** With these, the core leaves out what Settings, Experiments hides (Share). */
- experiments?: Experiments,
/** This device is signed in but not enrolled: a machine on the relay
* shows why, with its connection actions off. */
access?: MachineAccessNotice | null,
): SpaceDetailView {
- return core.tryCall<SpaceDetailView>("sidebar.detail", { space, usage, hostArch, experiments, access: access ?? undefined }) ?? fallbackDetail(space);
+ return core.tryCall<SpaceDetailView>("sidebar.detail", { space, usage, hostArch, access: access ?? undefined }) ?? fallbackDetail(space);
}
/** What the preview shows over (or instead of) the live desktop
@@ -382,9 +379,6 @@ export function agentRunLines(core: CoreClient, runs: SpaceAgentRun[]): AgentRun
/** What the detail is drawn for, beyond the Space: this device's view of it. */
export interface DetailFor {
- /** Settings, Experiments (Share shows only with Sharing on); undefined
- * where the host has none (every action shows). */
- experiments?: Experiments;
/** This machine's `accessNotice` (`useMachines`). */
access?: MachineAccessNotice | null;
}
@@ -430,7 +424,7 @@ export function useSpaceDetail(space: Space | undefined, hostArch: string | null
agents: { runs: null, failed: null, unsupported: false },
};
return {
- detail: spaceDetail(core, space, readings.usage, readings.hostArch !== undefined ? readings.hostArch : hostArch, seen.experiments, seen.access),
+ detail: spaceDetail(core, space, readings.usage, readings.hostArch !== undefined ? readings.hostArch : hostArch, seen.access),
stream: streamSection(core, {
windows: readings.windows,
failed: readings.failed,
diff --git a/apps/cua-spaces-web/src/bridge/upsell.ts b/apps/cua-spaces-web/src/bridge/upsell.ts
index 25431acd34..3986cfedef 100644
--- a/apps/cua-spaces-web/src/bridge/upsell.ts
+++ b/apps/cua-spaces-web/src/bridge/upsell.ts
@@ -22,7 +22,6 @@ import { useCallback, useContext, useEffect, useMemo, useRef, useState, useSyncE
import { BridgeContext } from "./BridgeProvider";
import type { CoreClient } from "./core";
-import { useFlag } from "./flags";
import { useAgents, useSettings } from "./hooks";
import type { RelayUsage } from "./ops/relay-usage";
import { useRelayUsage } from "./relay-usage";
@@ -272,16 +271,15 @@ function cardFor(core: CoreClient, reason: UpsellCardReason, usage: Partial<Rela
);
}
-/** Whether the flag is on and the core has a card for `reason` on this plan (draws and counts nothing). */
+/** Whether the core has a card for `reason` on this plan (draws and counts nothing). */
export function useUpsellCardAvailable(reason: UpsellCardReason | null, usage: Partial<RelayUsage> | null): boolean {
const core = useContext(BridgeContext)?.core;
- const on = useFlag("upsell_cards");
const accountApp = useSettings().data?.accountUrl ?? null;
- return Boolean(on && core && reason && cardFor(core, reason, usage, accountApp));
+ return Boolean(core && reason && cardFor(core, reason, usage, accountApp));
}
export interface UpsellCardState {
- /** The card to draw now; null when the flag is off, there is nothing to
+ /** The card to draw now; null when there is nothing to
* offer, the core is missing or it was closed. */
card: UpsellCard | null;
click(): void;
@@ -291,20 +289,18 @@ export interface UpsellCardState {
/**
* The limit card for `reason`: what happened, what the plan gives, the price,
* Upgrade and Not now. It is for the moment a limit stops the person, so it
- * is behind the `upsell_cards` flag (off unless turned on) and does not wait
- * for the 3-day gap. `reason` null: no limit here. `usage` carries the plan
+ * does not wait for the 3-day gap. `reason` null: no limit here. `usage` carries the plan
* (none known: Free). Events: `upsell_card_<reason>_shown | click | dismiss`,
* `shown` once per card drawn.
*/
export function useUpsellCard(reason: UpsellCardReason | null, usage: Partial<RelayUsage> | null): UpsellCardState {
const ctx = useContext(BridgeContext);
const core = ctx?.core;
- const on = useFlag("upsell_cards");
const accountApp = useSettings().data?.accountUrl ?? null;
const track = useTrack();
const [closed, setClosed] = useState<UpsellCardReason | null>(null);
const shown = useRef<UpsellCardReason | null>(null);
- const card = on && core && reason && closed !== reason ? cardFor(core, reason, usage, accountApp) : null;
+ const card = core && reason && closed !== reason ? cardFor(core, reason, usage, accountApp) : null;
const shownReason = card?.reason ?? null;
useEffect(() => {
if (!shownReason || shown.current === shownReason) return;
diff --git a/apps/cua-spaces-web/src/components/__tests__/add-computer-sheet.test.tsx b/apps/cua-spaces-web/src/components/__tests__/add-computer-sheet.test.tsx
index e4e986fdd6..fd9a9dd6bd 100644
--- a/apps/cua-spaces-web/src/components/__tests__/add-computer-sheet.test.tsx
+++ b/apps/cua-spaces-web/src/components/__tests__/add-computer-sheet.test.tsx
@@ -375,7 +375,7 @@ describe("Add a machine: for a team", () => {
const opened: unknown[] = [];
const { adapter } = host({}, {
"teams.list": teams(acme),
- "sharing.share": () => Promise.reject(new Error("Team machines need the Teams plan. https://app.cua.ai/buy/teams")),
+ "sharing.share": () => Promise.reject(new Error("Admin roles need the Teams plan. https://app.cua.ai/buy/teams")),
"session.openExternal": (args) => {
opened.push(args.url);
return Promise.resolve(undefined);
@@ -384,7 +384,7 @@ describe("Add a machine: for a team", () => {
await mount(adapter);
await waitFor(() => expect(document.querySelector('[data-pairing-team="failed"]')).toBeTruthy(), { timeout: 3000 });
const text = document.querySelector("[data-pairing-added]")?.textContent ?? "";
- expect(text).toContain("Added: Office PC. It isn't on Acme yet. Team machines need the Teams plan.");
+ expect(text).toContain("Added: Office PC. It isn't on Acme yet. Admin roles need the Teams plan.");
expect(text).not.toContain("https://");
fireEvent.click(document.querySelector("[data-pairing-upgrade]")!);
await waitFor(() => expect(opened).toEqual(["https://app.cua.ai/buy/teams"]));
diff --git a/apps/cua-spaces-web/src/components/__tests__/share-sheet-teams.test.tsx b/apps/cua-spaces-web/src/components/__tests__/share-sheet-teams.test.tsx
index acff059d5e..b880a5e7d9 100644
--- a/apps/cua-spaces-web/src/components/__tests__/share-sheet-teams.test.tsx
+++ b/apps/cua-spaces-web/src/components/__tests__/share-sheet-teams.test.tsx
@@ -4,7 +4,7 @@
import { act, cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
import { afterEach, describe, expect, it } from "vitest";
-import { BridgeProvider, defaultTeam, eligibleTeams, setFlagOverride, useShareSheet } from "@/bridge";
+import { BridgeProvider, defaultTeam, eligibleTeams, useShareSheet } from "@/bridge";
import type { DataAdapter } from "@/bridge/adapter";
import { createDemoAdapter } from "@/bridge/adapters/demo";
import type { CoreClient } from "@/bridge/core";
@@ -153,33 +153,7 @@ describe("Teams in Share and Add a machine", () => {
expect([...document.querySelectorAll("[data-share-team]")].map((b) => b.textContent)).toEqual(["Share with Beta"]);
});
- it("without a team the sheet explains, links to Teams and offers nothing to share with", async () => {
- const opened: string[] = [];
- const { adapter } = host({ teams: [], currentTeamId: null } as never);
- const base = adapter.call as (o: string, a: unknown) => Promise<unknown>;
- (adapter as { call: unknown }).call = (op: string, args: Record<string, unknown>) => {
- if (op === "session.openExternal") {
- opened.push(String(args.url));
- return Promise.resolve(null);
- }
- return base(op, args);
- };
- render(
- <BridgeProvider adapter={adapter} core={shareCore()}>
- <Opener />
- <ShareSheet />
- </BridgeProvider>,
- );
- await act(() => new Promise((r) => setTimeout(r, 10)));
- fireEvent.click(screen.getByText("open"));
- await waitFor(() => expect(document.querySelector("[data-share-disabled]")?.textContent).toBe("Sharing is for teams. Start a team to share this Space."));
- expect(document.querySelector("[data-share-teams]")).toBeNull();
- expect((document.querySelector("[data-share-who]") as HTMLInputElement).disabled).toBe(true);
- expect(screen.getByText("See Teams")).toBeTruthy();
- });
-
- it("with the upsell cards on, an account with no team gets the card in place of the plain gate", async () => {
- setFlagOverride("upsell_cards", true);
+ it("an account with no team gets the card in place of the plain gate", async () => {
const opened: string[] = [];
const { adapter } = host({ teams: [], currentTeamId: null } as never);
const base = adapter.call as (o: string, a: unknown) => Promise<unknown>;
diff --git a/apps/cua-spaces-web/src/components/add-computer-sheet.tsx b/apps/cua-spaces-web/src/components/add-computer-sheet.tsx
index c1a6340eec..434525fd07 100644
--- a/apps/cua-spaces-web/src/components/add-computer-sheet.tsx
+++ b/apps/cua-spaces-web/src/components/add-computer-sheet.tsx
@@ -12,7 +12,6 @@ import {
normalizePairingCode,
pairingLinkRelay,
teamName,
- useFlag,
useJoinWithCode,
useMachines,
usePairingCode,
@@ -439,9 +438,8 @@ function Footer({
const { openExternal } = useSession();
const team = pairing.team;
const limit = team?.phase === "failed" && team.upgradeUrl ? (team.kind ?? "other") : null;
- // Behind `upsell_cards`: a team owner out of seats or computers gets the
- // limit card (only an owner gets the checkout link) instead of Upgrade.
- const cards = useFlag("upsell_cards");
+ // A team owner out of seats or computers gets the limit card (only an owner
+ // gets the checkout link) instead of Upgrade.
const failedText = team?.phase === "failed" ? (team.error ?? "") : "";
const cardReason: "seats" | "machines" | null = !limit
? null
@@ -450,7 +448,7 @@ function Footer({
: limit === "machines" || /as many machines as it has seats/.test(failedText)
? "machines"
: null;
- const asCard = cards && cardReason !== null;
+ const asCard = cardReason !== null;
const shownLimit = useRef<string | null>(null);
useEffect(() => {
if (!limit) shownLimit.current = null;
diff --git a/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx b/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx
index 7da65284c7..9aa4cb063a 100644
--- a/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx
+++ b/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx
@@ -34,9 +34,9 @@ export function NewSpaceDialog() {
const wizard = useNewSpaceWizard();
const connect = useConnectCloud();
const { view, send } = wizard;
- const { defaultLocation, clouds = [], experiments } = wizard.env;
+ const { defaultLocation, clouds = [] } = wizard.env;
// The default only counts once the clouds it may name have loaded.
- const defaultKey = [defaultLocation, experiments?.yourCloud, ...clouds.map((c) => c.name)].join(" ");
+ const defaultKey = [defaultLocation, ...clouds.map((c) => c.name)].join(" ");
// Until the person picks, follow the configured default (it can arrive
// after the sheet opens, or change when a cloud is connected as default).
diff --git a/apps/cua-spaces-web/src/components/share-sheet.tsx b/apps/cua-spaces-web/src/components/share-sheet.tsx
index f028dd27b5..7d7e0e834e 100644
--- a/apps/cua-spaces-web/src/components/share-sheet.tsx
+++ b/apps/cua-spaces-web/src/components/share-sheet.tsx
@@ -6,8 +6,6 @@ import { useEffect } from "react";
import {
teamName,
useFeatureRecorded,
- useFlag,
- useSession,
useShareSheet,
useTeamChoices,
} from "@/bridge";
@@ -34,9 +32,7 @@ export default function ShareSheet() {
const { session, sharing } = useShareSheet();
useFeatureRecorded("share_open", Boolean(session));
const choices = useTeamChoices(Boolean(session?.input.signedIn && session.input.shareable));
- const { openExternal } = useSession();
const { hasTeam } = choices;
- const cards = useFlag("upsell_cards");
// The Space page that shows this Space's thread can add an agent to it instead.
const addAgent = useAddAgentLauncher(session?.input.spaceId);
useEffect(() => {
@@ -67,17 +63,12 @@ export default function ShareSheet() {
<DialogTitle className="text-[15px] font-semibold" data-share-title>
{v.title}
</DialogTitle>
- {gate && !v.disabledReason && cards ? <UpgradeCard reason="invite" className="mt-3" /> : null}
- {(v.disabledReason || gate) && !(cards && gate && !v.disabledReason) ? (
+ {gate && !v.disabledReason ? <UpgradeCard reason="invite" className="mt-3" /> : null}
+ {v.disabledReason ? (
<p className="mt-1.5 text-[13px] text-muted-foreground" data-share-disabled>
- {v.disabledReason ?? gate?.reason}
+ {v.disabledReason}
</p>
) : null}
- {!v.disabledReason && gate && !cards ? (
- <Button size="sm" variant="secondary" className="mt-2" onClick={() => void openExternal(gate.action.url).catch(() => {})} data-share-action>
- {gate.action.label}
- </Button>
- ) : null}
<form
className="mt-4 flex items-center gap-2"
diff --git a/apps/cua-spaces-web/src/components/shell/relay-allowance-notice.test.tsx b/apps/cua-spaces-web/src/components/shell/relay-allowance-notice.test.tsx
index f5ceba5934..bf4dc8935c 100644
--- a/apps/cua-spaces-web/src/components/shell/relay-allowance-notice.test.tsx
+++ b/apps/cua-spaces-web/src/components/shell/relay-allowance-notice.test.tsx
@@ -25,6 +25,14 @@ beforeAll(async () => {
const warning: RelayUsage = { ...demoRelayUsage(), hoursUsed: 16.5, liveSessions: 0 };
const reached: RelayUsage = { ...demoRelayUsage(), hoursUsed: 20.2, softLimitReached: true, reasons: ["hours"] };
+/** Waits for the limit card (a used allowance is a card, not the thin line). */
+const limitCard = () =>
+ waitFor(() => {
+ const el = document.querySelector("[data-relay-allowance='limit-card'] [data-upgrade-card]");
+ expect(el).toBeTruthy();
+ return el as HTMLElement;
+ });
+
/** The demo host answering `usage`, recording the links it opens. */
function host(usage: RelayUsage | null, accountUrl?: string) {
const demo = createDemoAdapter({ latencyMs: 0 });
@@ -57,28 +65,21 @@ describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice>", () => {
expect(document.querySelector("[data-relay-allowance]")).toBeNull();
});
- it("past the allowance: says the Spaces keep working, and Upgrade opens the plan's page", async () => {
+ it("past the allowance: a card says what Pro gives, and Upgrade opens the plan's page", async () => {
const { view, opened } = host(reached);
view();
- const notice = await screen.findByRole("status");
- expect(notice.textContent).toContain("You're using 20.2 of 20 remote hours on the free plan. Your Spaces keep working.");
- fireEvent.click(screen.getByRole("button", { name: "Upgrade" }));
- await waitFor(() => expect(opened).toEqual(["https://app.cua.ai/buy/pro?from=app_meter"]));
+ const card = await limitCard();
+ expect(card.textContent).toContain("Pro gives you 200 hours");
+ fireEvent.click(screen.getByRole("button", { name: "Upgrade to Pro" }));
+ await waitFor(() => expect(opened).toEqual(["https://app.cua.ai/buy/pro?from=app_card_hours"]));
});
- it("Upgrade opens the host's account app: Free to Pro, Pro to Teams", async () => {
+ it("Upgrade opens the host's account app", async () => {
const staging = host({ ...reached, upgradeUrl: null }, "https://app.staging.cua.ai");
staging.view();
- await waitFor(() => {
- fireEvent.click(screen.getByRole("button", { name: "Upgrade" }));
- expect(staging.opened).toContain("https://app.staging.cua.ai/buy/pro?from=app_meter");
- });
- cleanup();
- localStorage.clear();
- const pro = host({ ...reached, plan: "pro", upgradeUrl: null });
- pro.view();
- fireEvent.click(await screen.findByRole("button", { name: "Upgrade" }));
- await waitFor(() => expect(pro.opened).toEqual(["https://app.cua.ai/buy/teams?from=app_meter"]));
+ await limitCard();
+ fireEvent.click(screen.getByRole("button", { name: "Upgrade to Pro" }));
+ await waitFor(() => expect(staging.opened).toContain("https://app.staging.cua.ai/buy/pro?from=app_card_hours"));
});
it("at 80% of the hours: a heads-up that says nothing stops, with Pro's checkout", async () => {
@@ -98,7 +99,7 @@ describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice>", () => {
expect(document.querySelector("[data-relay-allowance]")).toBeNull();
cleanup();
host({ ...reached, liveSessions: 1 }).view();
- expect(await screen.findByRole("status")).toBeTruthy();
+ await limitCard();
});
it("the heads-up shows once: one prompt every three days, and a closed one stays closed", async () => {
@@ -111,13 +112,14 @@ describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice>", () => {
cleanup();
// The limit notice has its own dismissal and is not held back by the heads-up's.
host(reached).view();
- expect(await screen.findByRole("status")).toBeTruthy();
+ await limitCard();
});
it("dismissed, it stays hidden for that month and reason, and shows again for another", async () => {
const first = host(reached);
first.view();
- fireEvent.click(await screen.findByRole("button", { name: "Dismiss" }));
+ await limitCard();
+ fireEvent.click(screen.getByRole("button", { name: "Not now" }));
expect(document.querySelector("[data-relay-allowance]")).toBeNull();
cleanup();
@@ -127,6 +129,6 @@ describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice>", () => {
cleanup();
host({ ...reached, reasons: ["sessions", "hours"] }).view();
- expect(await screen.findByRole("status")).toBeTruthy();
+ await limitCard();
});
});
diff --git a/apps/cua-spaces-web/src/components/upgrade-card.test.tsx b/apps/cua-spaces-web/src/components/upgrade-card.test.tsx
index 3c954e3bcb..6ef98524bf 100644
--- a/apps/cua-spaces-web/src/components/upgrade-card.test.tsx
+++ b/apps/cua-spaces-web/src/components/upgrade-card.test.tsx
@@ -7,7 +7,7 @@ import { afterEach, beforeAll, describe, expect, it } from "vitest";
import { createDemoAdapter } from "@/bridge/adapters/demo";
import { demoRelayUsage } from "@/bridge/adapters/demo/relay-usage";
import { testCore, wasmBuilt } from "@/bridge/__tests__/testCore";
-import { BridgeProvider, flagOn, resetUpsellMemory, setFlagOverride, setRemoteFlags, type CoreClient, type DataAdapter, type RelayUsage, type UpsellCardReason } from "@/bridge";
+import { BridgeProvider, resetUpsellMemory, type CoreClient, type DataAdapter, type RelayUsage, type UpsellCardReason } from "@/bridge";
import { RelayAllowanceNotice } from "./shell/relay-allowance-notice";
import { UpgradeCard } from "./upgrade-card";
@@ -15,7 +15,6 @@ import { UpgradeCard } from "./upgrade-card";
afterEach(() => {
cleanup();
localStorage.clear();
- setRemoteFlags({});
resetUpsellMemory();
});
@@ -48,28 +47,8 @@ function host(usage: RelayUsage | null) {
return { opened, features, view };
}
-describe("the upsell_cards flag", () => {
- it("is off by default, and a device override or a remote value turns it on", () => {
- expect(flagOn("upsell_cards")).toBe(false);
- setRemoteFlags({ upsell_cards: true });
- expect(flagOn("upsell_cards")).toBe(true);
- setFlagOverride("upsell_cards", false);
- expect(flagOn("upsell_cards")).toBe(false);
- setFlagOverride("upsell_cards", null);
- expect(flagOn("upsell_cards")).toBe(true);
- });
-});
-
describe.skipIf(!wasmBuilt)("<UpgradeCard>", () => {
- it("draws nothing while the flag is off", async () => {
- const { view } = host(reached);
- view("hours");
- await act(() => new Promise((r) => setTimeout(r, 20)));
- expect(document.querySelector("[data-upgrade-card]")).toBeNull();
- });
-
- it("flag on: says what happened, what Pro gives and the price; Upgrade opens the Pro checkout and is counted", async () => {
- setFlagOverride("upsell_cards", true);
+ it("says what happened, what Pro gives and the price; Upgrade opens the Pro checkout and is counted", async () => {
const { view, opened, features } = host(reached);
view("hours");
const card = await waitFor(() => {
@@ -87,7 +66,6 @@ describe.skipIf(!wasmBuilt)("<UpgradeCard>", () => {
});
it("Not now closes it and is counted", async () => {
- setFlagOverride("upsell_cards", true);
const { view, features } = host(reached);
view("invite");
fireEvent.click(await screen.findByRole("button", { name: "Not now" }));
@@ -96,7 +74,6 @@ describe.skipIf(!wasmBuilt)("<UpgradeCard>", () => {
});
it("a team plan has nothing to buy for an invite", async () => {
- setFlagOverride("upsell_cards", true);
const { view } = host({ ...reached, plan: "team" });
view("invite");
await act(() => new Promise((r) => setTimeout(r, 20)));
@@ -106,7 +83,6 @@ describe.skipIf(!wasmBuilt)("<UpgradeCard>", () => {
describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice> with the cards on", () => {
it("a used allowance is a card, and its Not now keeps it closed for the month", async () => {
- setFlagOverride("upsell_cards", true);
const { view } = host(reached);
view();
const card = await waitFor(() => {
@@ -121,7 +97,6 @@ describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice> with the cards on", () => {
});
it("a Pro account at 5 of 5 live sessions with empty reasons gets the sessions card", async () => {
- setFlagOverride("upsell_cards", true);
const { view } = host({ ...reached, plan: "pro", hoursUsed: 10, hoursLimit: 200, liveSessions: 5, liveSessionsLimit: 5, reasons: [], softLimitReached: false });
view();
const card = await waitFor(() => {
@@ -134,17 +109,9 @@ describe.skipIf(!wasmBuilt)("<RelayAllowanceNotice> with the cards on", () => {
});
it("a plan with no card keeps the notice and its Upgrade link", async () => {
- setFlagOverride("upsell_cards", true);
const { view } = host({ ...reached, plan: "enterprise" });
view();
await screen.findByRole("status");
expect(document.querySelector("[data-upgrade-card]")).toBeNull();
});
-
- it("with the flag off the thin line is unchanged", async () => {
- const { view } = host(reached);
- view();
- await screen.findByRole("status");
- expect(document.querySelector("[data-upgrade-card]")).toBeNull();
- });
});
diff --git a/apps/cua-spaces-web/src/components/upgrade-card.tsx b/apps/cua-spaces-web/src/components/upgrade-card.tsx
index b3a5e09331..33580ec4e8 100644
--- a/apps/cua-spaces-web/src/components/upgrade-card.tsx
+++ b/apps/cua-spaces-web/src/components/upgrade-card.tsx
@@ -7,8 +7,8 @@ import { Button } from "@/components/ui/button";
/**
* What a limit offers, at the moment it stops someone: what happened, the one
* line of what Pro or Teams gives, the price, Upgrade (opens the checkout on
- * the account app) and Not now. Behind the `upsell_cards` flag; nothing is
- * drawn while it is off, there is nothing to offer, or after Not now. The
+ * the account app) and Not now. Nothing is
+ * drawn when there is nothing to offer, or after Not now. The
* words and the plan each reason leads to are the app core's
* (`upsell.card`). It never blocks anything: the relay and the control plane
* enforce the limit.
diff --git a/apps/cua-spaces-web/src/routes/spaces/$spaceId.tsx b/apps/cua-spaces-web/src/routes/spaces/$spaceId.tsx
index 09efc0124a..039e05db22 100644
--- a/apps/cua-spaces-web/src/routes/spaces/$spaceId.tsx
+++ b/apps/cua-spaces-web/src/routes/spaces/$spaceId.tsx
@@ -5,7 +5,7 @@ import { createFileRoute, Link, useNavigate } from "@tanstack/react-router";
import { ArrowDownCircleIcon, ChevronLeftIcon, MonitorIcon, PictureInPicture2Icon, PlayIcon, SquareIcon, Trash2Icon, UserPlusIcon } from "lucide-react";
import { useEffect, useRef, useState, type ReactNode } from "react";
-import { hostResources, parseDropped, runCreateFix, spaceResources, useBridge, useResources, useDevices, useExperiments, useMachines, useSession, useShareSheet, useSpaceDetail, useSpaceFiles, useSpaces, useSpaceThread, useTeleport, type CreateReport, type Machine, type ResourcesSnapshot, type Space, type StreamRow, type ThreadView } from "@/bridge";
+import { hostResources, parseDropped, runCreateFix, spaceResources, useBridge, useResources, useDevices, useMachines, useSession, useShareSheet, useSpaceDetail, useSpaceFiles, useSpaces, useSpaceThread, useTeleport, type CreateReport, type Machine, type ResourcesSnapshot, type Space, type StreamRow, type ThreadView } from "@/bridge";
import { DiagnosticReportDialog } from "@/components/diagnostic-report-dialog";
import { OsIcon } from "@/components/os-icon";
import { EmptyState, Page } from "@/components/page";
@@ -99,14 +99,11 @@ function SpaceDetailPage() {
}, [dropped, space?.id]);
const thisMachine = machines.find((m) => m.current);
const hostArch = thisMachine?.arch ?? null;
- // As this device sees it: Share only with Settings, Experiments, Sharing
- // on (every action where the host has no experiments), and a machine on
- // the relay greyed out while this device is not enrolled.
- const exp = useExperiments();
- const experiments = exp.unsupported ? undefined : (exp.data?.experiments ?? {});
+ // As this device sees it: a machine on the relay greyed out while this
+ // device is not enrolled.
const access = thisMachine?.accessNotice ?? null;
const devices = useDevices();
- const { detail, stream, windowsUnsupported, pip, query, setQuery, agents, copy } = useSpaceDetail(space, hostArch, { experiments, access });
+ const { detail, stream, windowsUnsupported, pip, query, setQuery, agents, copy } = useSpaceDetail(space, hostArch, { access });
// Call view or thread view, remembered per Space.
const [layout, setLayout] = useSpaceLayout(space?.id ?? "");
const volumeError = useSpaceVolumeError(space, space ? spaceState(space) === "running" : false);
diff --git a/apps/cua-spaces/src/components/SettingsPanel.test.tsx b/apps/cua-spaces/src/components/SettingsPanel.test.tsx
index 43340fb1a3..93af0a474b 100644
--- a/apps/cua-spaces/src/components/SettingsPanel.test.tsx
+++ b/apps/cua-spaces/src/components/SettingsPanel.test.tsx
@@ -423,10 +423,6 @@ describe("SettingsPanel Experiments", () => {
await screen.findByText("Share usage data to help improve Cua");
const experiments = within(screen.getByRole("region", { name: "Experiments" }));
expect(experiments.getByRole("switch", { name: "Cua Volume" })).toHaveAttribute("aria-checked", "false");
- // Sharing is on by default (cua.ai/pricing lists it), and so is Your cloud (a linked cloud shows under Run on).
- for (const name of ["Sharing", "Your cloud"]) {
- expect(experiments.getByRole("switch", { name })).toHaveAttribute("aria-checked", "true");
- }
expect(screen.queryByRole("region", { name: "Storage" })).toBeNull();
await user.click(experiments.getByRole("switch", { name: "Cua Volume" }));
expect(await screen.findByRole("region", { name: "Storage" })).toBeInTheDocument();
@@ -437,7 +433,7 @@ describe("SettingsPanel Experiments", () => {
});
expect(telemetry.recordSignals).toHaveBeenCalledWith([
{ type: "experiment", action: "experiment_on", experiment: "cua_volume" },
- { type: "experiments-on", experiments: ["cua_volume", "your_cloud", "sharing"] },
+ { type: "experiments-on", experiments: ["cua_volume"] },
]);
});
});
diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
index 57123059b6..9adc2bb12c 100644
--- a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
+++ b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
@@ -130,19 +130,15 @@ describe("MainWindow", () => {
expect(within(dialog).queryByRole("combobox", { name: "Run on" })).toBeNull();
});
- it("runs on this Mac, offers no cloud with Your cloud turned off, never Cua Cloud", async () => {
- window.localStorage.setItem("cua.settings.experiments", JSON.stringify({ yourCloud: false }));
+ it("runs on this Mac, offers a cloud to add, never Cua Cloud", async () => {
setup();
fireEvent.click(await screen.findByRole("button", { name: "New Space" }));
const dialog = await screen.findByRole("dialog", { name: "New Space" });
- expect(within(within(dialog).getByRole("combobox", { name: "Run on" })).getAllByRole("option").map((o) => o.textContent)).toEqual(["This Mac"]);
- expect(within(dialog).queryByRole("option", { name: /Add your cloud account/ })).toBeNull();
+ expect(within(within(dialog).getByRole("combobox", { name: "Run on" })).getAllByRole("option").map((o) => o.textContent)).toEqual(["This Mac", "Add your cloud account…"]);
expect(within(dialog).queryByText(/Cua Cloud/)).toBeNull();
- window.localStorage.removeItem("cua.settings.experiments");
});
it("connects a cloud from the wizard, tests it, then creates there", async () => {
- // Your cloud is on by default (Settings, Experiments).
const cloud = createFakeCloudBridge();
const { createSpace } = setup({}, true, cloud);
fireEvent.click(await screen.findByRole("button", { name: "New Space" }));
diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.tsx
index c9c88efd60..b91f3bf18c 100644
--- a/apps/cua-spaces/src/components/desktop/MainWindow.tsx
+++ b/apps/cua-spaces/src/components/desktop/MainWindow.tsx
@@ -72,7 +72,6 @@ import { ThisMachinePanel } from '../ThisMachinePanel';
import { THIS_MACHINE_ID } from '../../model/host';
import { Thumbnail } from '../Thumbnail';
import { NewSpaceWizard, type CreatePlan, type SpaceHost } from './NewSpaceWizard';
-import type { Experiments } from '../../model/experiments';
import { useExperiments } from '../../state/experiments';
import { createLoginItemBridge, type LoginItemBridge } from '../../native/loginItem';
import { launchPlan, readLaunchChoice, writeLaunchChoice } from '../../model/loginItem';
@@ -117,10 +116,9 @@ function viewerRequest(space: Space): ViewerWindowRequest {
function detailOf(
space: Space,
usage: SpaceUsage | null | undefined,
- hostArch: string | null | undefined,
- experiments: Experiments
+ hostArch: string | null | undefined
): SpaceDetailView {
- return spaceDetail(space, usage, hostArch, experiments);
+ return spaceDetail(space, usage, hostArch);
}
/**
@@ -224,7 +222,7 @@ export function MainWindow({
const [local, setLocal] = useState<LocalStatus | null>(null);
const [gpus, setGpus] = useState<GpuChoice[] | null>(null);
const [hosts, setHosts] = useState<SpaceHost[]>([]);
- // Settings, Experiments: what the window shows (Share, your clouds).
+ // Settings, Experiments: what the window shows.
const experiments = useExperiments();
// `?view=new-space|settings|this-machine|host-setup|drive|onboarding-presentation|onboarding-drive|onboarding-done` opens that
// view on load (the shell sets it from CUA_SPACES_START_VIEW, for demos
@@ -549,8 +547,7 @@ export function MainWindow({
? detailOf(
selected,
usage?.id === selected.id ? usage.usage : null,
- sync.hostArch,
- experiments
+ sync.hostArch
)
: null;
const isHost = Boolean(detail?.isHost);
diff --git a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx
index 2e2e76147e..cb6158147e 100644
--- a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx
+++ b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx
@@ -51,8 +51,6 @@ const entries = () =>
within(runOnMenu())
.getAllByRole("option")
.map((o) => `${o.textContent}${(o as HTMLOptionElement).disabled ? " (disabled)" : ""}`);
-const YOUR_CLOUD = { cuaVolume: false, yourCloud: true, sharing: false };
-const NO_CLOUD = { cuaVolume: false, yourCloud: false, sharing: false };
const MINI: SpaceHost = { id: "m-mini", name: "Mac mini", via: "relay", online: true, os: "macos", limits: [] };
const STUDIO: SpaceHost = { id: "m-studio", name: "Studio", via: "relay", online: false, os: "", limits: [] };
const suggestionRefs = () =>
@@ -189,16 +187,10 @@ describe("New Space wizard", () => {
);
});
- it("lists This Mac and your machines; your clouds and Connect a cloud unless Your cloud is off", () => {
+ it("lists This Mac, your machines, your clouds and Connect a cloud", () => {
const onConnectCloud = vi.fn();
- renderWizard({ clouds: [AWS], hosts: [MINI, STUDIO], onConnectCloud, experiments: NO_CLOUD });
- expect(entries()).toEqual(["Auto", "This Mac", "Mac mini", "Studio (offline) (disabled)"]);
- expect(runOnMenu()).toHaveValue("local");
+ renderWizard({ clouds: [AWS], hosts: [MINI, STUDIO], onConnectCloud });
expect(screen.queryByText(/Cua Cloud/)).toBeNull();
- expect(screen.queryByText(/Add your cloud account/)).toBeNull();
- expect(screen.queryByRole("button", { name: /Connect a cloud/ })).toBeNull();
- cleanup();
- renderWizard({ clouds: [AWS], hosts: [MINI, STUDIO], onConnectCloud, experiments: YOUR_CLOUD });
expect(entries()).toEqual(["Auto", "This Mac", "Mac mini", "Studio (offline) (disabled)", "AWS \u00b7 us-west-2", "Add your cloud account…"]);
runOn("add:cloud");
expect(onConnectCloud).toHaveBeenCalled();
@@ -219,7 +211,7 @@ describe("New Space wizard", () => {
});
it("creates in a connected cloud with its machine, cost and lifetime", () => {
- const props = renderWizard({ clouds: [AWS], experiments: YOUR_CLOUD });
+ const props = renderWizard({ clouds: [AWS] });
runOn("aws");
expect(runOnMenu()).toHaveValue("aws");
// Windows cannot run there: its tile is greyed out.
diff --git a/apps/cua-spaces/src/model/experiments.ts b/apps/cua-spaces/src/model/experiments.ts
index 5eedc1e056..9bcd129481 100644
--- a/apps/cua-spaces/src/model/experiments.ts
+++ b/apps/cua-spaces/src/model/experiments.ts
@@ -4,8 +4,7 @@
/**
* Settings, Experiments, from the app core (`experiments::*`): one switch
* per feature still being built, all off by default, and what each hides
- * while off (Cua Volume: the first run's Volume page and Settings, Storage;
- * Your cloud: your clouds in New Space; Sharing: a Space's Share button).
+ * while off (Cua Volume: the first run's Volume page and Settings, Storage).
* Off only hides: nothing set up is undone. The SwiftUI app draws the same.
*/
import { core } from "../core";
@@ -15,11 +14,9 @@ import type { SettingsPage, SettingsSection } from "./window";
/** The switches, as stored (`cua.settings.experiments`). */
export interface Experiments {
cuaVolume: boolean;
- yourCloud: boolean;
- sharing: boolean;
}
-export const NO_EXPERIMENTS: Experiments = { cuaVolume: false, yourCloud: true, sharing: true };
+export const NO_EXPERIMENTS: Experiments = { cuaVolume: false };
/** The Experiments tab: a switch and one line per experiment. */
export function experimentsPage(experiments: Experiments): SettingsPage {
diff --git a/apps/cua-spaces/src/model/parity.test.ts b/apps/cua-spaces/src/model/parity.test.ts
index 5ad36d83cc..53ccadeaa6 100644
--- a/apps/cua-spaces/src/model/parity.test.ts
+++ b/apps/cua-spaces/src/model/parity.test.ts
@@ -131,7 +131,7 @@ const MODEL: Record<string, (a: Args) => unknown> = {
'keyvault.credentialForm': (a) => kvCredentialForm(a.overview),
'keyvault.passphraseCheck': (a) => kvPassphraseCheck(a.mode, a.passphrase, a.confirm),
'sidebar.build': (a) => sidebar(a.spaces, a.query ?? '', a.selectedId ?? null),
- 'sidebar.detail': (a) => spaceDetail(a.space, a.usage, a.hostArch, a.experiments),
+ 'sidebar.detail': (a) => spaceDetail(a.space, a.usage, a.hostArch),
'experiments.page': (a) => experimentsPage(a.experiments),
'experiments.choose': (a) => chooseExperiment(a.experiments, a.row, a.option),
'settings.withStorage': (a) => settingsWithStorage(a.page, a.storage, a.experiments),
diff --git a/apps/cua-spaces/src/model/window.ts b/apps/cua-spaces/src/model/window.ts
index 6aed86c625..426c2e4a55 100644
--- a/apps/cua-spaces/src/model/window.ts
+++ b/apps/cua-spaces/src/model/window.ts
@@ -137,19 +137,16 @@ export const USAGE_REFRESH_MS = 10_000;
/** The selected Space's detail (`spaces::sidebar::detail_live`). */
/** `hostArch`: this Mac's CPU architecture; a local Space of another one
- * warns on its Architecture (emulated). With `experiments`, what Settings,
- * Experiments hides is left out (Share while Sharing is off). */
+ * warns on its Architecture (emulated). */
export function spaceDetail(
space: Space,
usage?: SpaceUsage | null,
hostArch?: string | null,
- experiments?: import("./experiments").Experiments | null,
): SpaceDetailView {
return core("sidebar.detail", {
space,
usage: usage ?? null,
hostArch: hostArch ?? null,
- experiments: experiments ?? null,
});
}
diff --git a/apps/cua-spaces/src/state/experiments.ts b/apps/cua-spaces/src/state/experiments.ts
index 00d891ecec..14fc36e479 100644
--- a/apps/cua-spaces/src/state/experiments.ts
+++ b/apps/cua-spaces/src/state/experiments.ts
@@ -35,8 +35,6 @@ export function currentExperiments(): Experiments {
}
const value: Experiments = {
cuaVolume: stored.cuaVolume === true,
- yourCloud: stored.yourCloud !== false,
- sharing: stored.sharing !== false,
};
cache = { raw, value: { ...NO_EXPERIMENTS, ...value } };
return cache.value;
diff --git a/docs/content/docs/cua-sdk/concepts/telemetry-events.mdx b/docs/content/docs/cua-sdk/concepts/telemetry-events.mdx
index e11a68c321..28fe5c599a 100644
--- a/docs/content/docs/cua-sdk/concepts/telemetry-events.mdx
+++ b/docs/content/docs/cua-sdk/concepts/telemetry-events.mdx
@@ -42,7 +42,7 @@ Every event carries: `telemetry_schema_version`, `event_version`, `product`
| `cua_daemon_health` | `uptime_bucket`, `sandboxes` | Hourly aggregate health. |
| `cua_spacesd_health` | `uptime_bucket`, `imports_failed` | In-sandbox health, hourly. |
| `cua_spacesd_session_deliveries` | `delivery_grant` (`present` or `absent`), `count` | Session deliveries with and without a Keyvault grant. |
-| `cua_app_active` | `experiments_on` (the Cua Spaces experiments turned on in Settings, Experiments: `cua_volume`, `your_cloud`, `sharing` joined with `+`, or `none`), `ui_locale` (the Cua Spaces interface language: `en`, `zh-Hans`, `ko`, `pt-BR`, `ja`, `es`, or `other`; never a region or free text) | Daily and weekly active installs and retention: at most one per install per UTC day. Also installs per experiment, and which languages to ship. |
+| `cua_app_active` | `experiments_on` (the Cua Spaces experiments turned on in Settings, Experiments: `cua_volume`, `secure_spaces`, `child_spaces`, `ask_first`, `ci_runners`, `tcp_shares`, `mobile`, `warm_pools` joined with `+`, or `none`), `ui_locale` (the Cua Spaces interface language: `en`, `zh-Hans`, `ko`, `pt-BR`, `ja`, `es`, or `other`; never a region or free text) | Daily and weekly active installs and retention: at most one per install per UTC day. Also installs per experiment, and which languages to ship. |
| `cua_onboarding_page` | `page` (`welcome`, `command_line`, `signin`, `agents`, `presentation`, `volume`, `this_machine`, `done`), `action` (`shown`, `completed`, `skipped`, `back`), `choice` (a fixed word such as `installed`, `signed_in`, `menu_bar_only`, `s3`, `host`, or `none`) | Which first-run page people leave on, and what they pick. |
| `cua_onboarding_step_viewed` | `step` (`welcome`, `connect_agent`, `terminal`, `sign_in`, `permissions`, `create_space`), `step_index` (its position, 1 to 6), `onboarding_version` (2) | How many installs see each first-run screen. The OS and app version are the `os_family` and `product_version` every event carries. |
| `cua_onboarding_step_completed` | `step`, `step_index`, `onboarding_version` | How many installs finish each first-run screen. |
@@ -61,7 +61,7 @@ Every event carries: `telemetry_schema_version`, `event_version`, `product`
| `cua_app_update` | `action` (`checked`, `found`, `not_found`, `downloaded`, `installed`, `failed`), `channel` (`stable` or `beta`), `trigger` (`user` or `background`) | Whether people update. |
| `cua_device_enroll` | `method` (`sign_in`, `approval`, `rekey`), `outcome` | How devices join your account's relay. |
| `cua_cloud_link` | `action` (`connect`, `disconnect`, `approve`, `deny`), `cloud` (`aws`, `gcp`, `azure`, `hetzner`, `modal`, `other`), `auth` (`cli`, `oidc`, `sealed`, `none`), `status` (`connected`, `needs_trust`, `checking`, `waiting_for_approval`, `failed`, `not_connected`, `error`), `outcome` | Which of your own clouds people link and how, how many move from a CLI sign-in to OIDC, and where linking stops. Never an account, id, region or token. |
-| `cua_experiment` | `action` (`experiment_on` or `experiment_off`), `experiment` (`cua_volume`, `your_cloud`, `sharing`) | Which experiments people try, and turn off again. |
+| `cua_experiment` | `action` (`experiment_on` or `experiment_off`), `experiment` (`cua_volume`, `secure_spaces`, `child_spaces`, `ask_first`, `ci_runners`, `tcp_shares`, `mobile`, `warm_pools`) | Which experiments people try, and turn off again. |
| `cua_plan_limit_shown` | `surface`, `kind`, `plan` (see below) | How often people reach a plan limit, which one, on which plan, and where they see it. |
| `cua_upgrade_link_opened` | `surface`, `kind`, `plan` (see below) | Which limit notices and upgrade prompts people act on: the start of the purchase funnel. |
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/experiments.json b/libs/cua/crates/cua-spaces-app-core/parity/experiments.json
index 80e78f74b1..e4b1bd5ef6 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/experiments.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/experiments.json
@@ -1,16 +1,14 @@
{
"name": "experiments",
- "about": "Settings, Experiments: every switch at its default (Sharing and Your cloud on, the rest off), then each changed. After each change: the tab (a switch and one line per experiment), the events it sends (experiment_on or experiment_off, then the set that is on), Settings (Storage after General only with Cua Volume, and the launch-at-login line), the first run's pages and Done page (the Volume page and its line only with Cua Volume), the main window's Volume page and the menu bar's Volume sync line and conflicts (only with Cua Volume), a shared Space's buttons (Share only with Sharing) and New Space's Run on menu and links (the connected cloud and Connect a cloud unless Your cloud is off). Turning one off undoes nothing: AWS stays connected, the Volume stays mounted and the Space stays shared.",
+ "about": "Settings, Experiments: every switch at its default (all off), then each changed. After each change: the tab (a switch and one line per experiment), the events it sends (experiment_on or experiment_off, then the set that is on), Settings (Storage after General only with Cua Volume, and the launch-at-login line), the first run's pages and Done page (the Volume page and its line only with Cua Volume), the main window's Volume page and the menu bar's Volume sync line and conflicts (only with Cua Volume), a shared Space's buttons and New Space's Run on menu and links (the connected cloud and Connect a cloud are always there). Turning one off undoes nothing: the Volume stays mounted.",
"now": 1790000000000,
"changes": [
{ "step": "cua volume on", "row": "experiment:cua_volume", "option": "on" },
- { "step": "your cloud off", "row": "experiment:your_cloud", "option": "off" },
- { "step": "sharing on", "row": "experiment:sharing", "option": "on" },
- { "step": "on again changes nothing", "row": "experiment:sharing", "option": "on" },
+ { "step": "mobile on", "row": "experiment:mobile", "option": "on" },
+ { "step": "on again changes nothing", "row": "experiment:mobile", "option": "on" },
{ "step": "another row changes nothing", "row": "notch", "option": "hide" },
{ "step": "cua volume off", "row": "experiment:cua_volume", "option": "off" },
- { "step": "your cloud on again", "row": "experiment:your_cloud", "option": "on" },
- { "step": "sharing off", "row": "experiment:sharing", "option": "off" }
+ { "step": "mobile off", "row": "experiment:mobile", "option": "off" }
],
"settings": {
"identity": "[email protected]",
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 d29e331132..15935cc95f 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
@@ -92,10 +92,6 @@
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {On|*Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {*On|Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
@@ -231,9 +227,7 @@
},
{
"experiments": [
- "cua_volume",
- "your_cloud",
- "sharing"
+ "cua_volume"
],
"type": "experiments-on"
}
@@ -244,10 +238,6 @@
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {*On|Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {*On|Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
@@ -377,28 +367,24 @@
],
"signals": [
{
- "action": "experiment_off",
- "experiment": "your_cloud",
+ "action": "experiment_on",
+ "experiment": "mobile",
"type": "experiment"
},
{
"experiments": [
"cua_volume",
- "sharing"
+ "mobile"
],
"type": "experiments-on"
}
],
- "step": "your cloud off",
+ "step": "mobile on",
"tab": [
"= Experiments",
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {*On|Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {On|*Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
@@ -409,7 +395,7 @@
"- experiment:ci_runners-note note: Run GitHub Actions jobs in a fresh Space each, on this computer.",
"- experiment:tcp_shares toggle: Public TCP shares {On|*Off}",
"- experiment:tcp_shares-note note: Share a game server or another TCP service in a Space at a public address.",
- "- experiment:mobile toggle: Phone app {On|*Off}",
+ "- experiment:mobile toggle: Phone app {*On|Off}",
"- experiment:mobile-note note: Your computers answer the Cua Spaces phone app: start a task, follow the thread, review changes and get alerts.",
"- experiment:warm_pools toggle: Warm start {On|*Off}",
"- experiment:warm_pools-note note: Keep one Linux Space ready on this computer, with its coding apps installed, so the next Create from Home starts at once."
@@ -421,149 +407,17 @@
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
"---",
"local | This Mac | Linux, on this Mac | on *",
"---",
- "host:m-mini | Mac mini | Through the Cua relay | on"
- ]
- }
- },
- {
- "actions": [
- "teleport: Teleport an app [arrow.down.circle] ?Teleport an app into this Space",
- "pip: Picture in picture [pip.enter] ?Picture in picture",
- "share: Share [person.badge.plus] ?Share this Space",
- "delete: Remove [trash] ?Remove from the list (destructive)",
- "open: Open [-] ?Open the desktop in its own window (primary)"
- ],
- "menu": [
- "status: No Spaces running · Syncing 2… (disabled)",
- "volume-conflicts: 1 conflict",
- "---",
- "open: Open Cua Spaces",
- "new-space: New Space…",
- "settings: Settings… ⌘,",
- "---",
- "quit: Quit Cua Spaces ⌘Q"
- ],
- "onboarding": {
- "done": {
- "canBack": true,
- "canSkip": false,
- "choices": [],
- "dots": "Welcome,Sign in,AI agents,Menu bar,Cua Volume,This computer,*Done",
- "drive": null,
- "driveStorage": null,
- "launchAtLogin": "[x] Launch at login ~Keeps your Spaces, agents and Cua Volume available after a restart.",
- "lede": "3 things are left. You can finish them now, or later from the menu bar.",
- "notice": null,
- "noticeLink": null,
- "presentations": [],
- "primary": "Start using Cua Spaces",
- "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"
- ],
- "showMark": false,
- "step": "done",
- "summary": [
- "Shows in: Notch and menu bar",
- "This computer: Opens your other computers"
- ],
- "title": "Almost done",
- "todos": [
- "[ ] Cua CLI ~Command-line tools for you and your agents. -> Install the Cua CLI",
- "[ ] Account ~Reach your computers from any computer. -> Sign in",
- "[ ] AI agents ~Let Claude Code, Codex and others use Cua. -> Connect an AI agent",
- "[x] Cua Volume ~Shared folder: files your agents can share across your computers. In Finder. (optional)"
- ],
- "usage": null
- },
- "pages": [
- "welcome",
- "signin",
- "agents",
- "presentation",
- "drive",
- "mode",
- "done"
- ]
- },
- "settings": [
- "= Settings",
- "# Account (account)",
- "- account text: [email protected] [Sign out]",
- "# Teams (teams)",
- "- teams text: Teams = Manage your team in the account app",
- "- teams-manage text: Invite people, roles and plans [Manage team] < https://app.cua.ai/team>",
- "- teams-billing text: Billing [Billing and plans] < https://app.cua.ai/billing>",
- "# General (general)",
- "- launch-at-login toggle: Launch Cua Spaces at login {*On|Off}",
- "- launch-at-login-note note: Keeps your Spaces, agents and Cua Volume available after a restart.",
- "- notch choice: Spaces tab in the notch {*Show|Hide}",
- "- welcome text: Welcome [Show again]",
- "- tips toggle: Show tips {*On|Off}",
- "- reset-tips text: Reset tips [Reset]",
- "# Storage (storage)",
- "- backend choice: Store files on {*This Mac|S3-compatible}",
- "- fs-path text: Stored in = ~/.cua/volume/data ?/Users/maya/.cua/volume/data",
- "- mount choice: Add Cua Volume to Finder {*On|Off}",
- "- mount-path text: In Finder at = ~/Cua Volume [Show in Finder] ?/Users/maya/Cua Volume < /Users/maya/Cua Volume>",
- "# Runtimes (runtimes)",
- "- runtime:container choice: Containers {*Automatic|Cua’s own|Already installed} ?Checking…",
- "- runtime:vm choice: Virtual machines {*Automatic|Cua’s own|Already installed} ?Checking…",
- "- runtime:microvm choice: MicroVMs {*Automatic|Cua’s own|Already installed} ?Checking…",
- "# Privacy (privacy)",
- "- telemetry choice: Share usage data to help improve Cua {*On|Off}",
- "- telemetry-note note: Which features you use and when something goes wrong. Linked to your account through a random ID while you're signed in. Never your files, what you type or your screen. <What is collected https://cua.ai/docs/cua-sdk/concepts/telemetry>",
- "# AI agents (agents) [Configure all detected agents] (disabled)"
- ],
- "signals": [],
- "step": "sharing on",
- "tab": [
- "= Experiments",
- "# Experiments (experiments)",
- "- experiment:cua_volume toggle: Cua Volume {*On|Off}",
- "- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {On|*Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
- "- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
- "- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
- "- experiment:child_spaces toggle: Child Spaces {On|*Off}",
- "- experiment:child_spaces-note note: A Space can make Spaces of its own, inside a budget you set.",
- "- experiment:ask_first toggle: Ask first {On|*Off}",
- "- experiment:ask_first-note note: An agent asks you on a card before anything leaves its Space, such as a push to GitHub.",
- "- experiment:ci_runners toggle: CI runners {On|*Off}",
- "- experiment:ci_runners-note note: Run GitHub Actions jobs in a fresh Space each, on this computer.",
- "- experiment:tcp_shares toggle: Public TCP shares {On|*Off}",
- "- experiment:tcp_shares-note note: Share a game server or another TCP service in a Space at a public address.",
- "- experiment:mobile toggle: Phone app {On|*Off}",
- "- experiment:mobile-note note: Your computers answer the Cua Spaces phone app: start a task, follow the thread, review changes and get alerts.",
- "- experiment:warm_pools toggle: Warm start {On|*Off}",
- "- experiment:warm_pools-note note: Keep one Linux Space ready on this computer, with its coding apps installed, so the next Create from Home starts at once."
- ],
- "volumePage": "Volume",
- "wizard": {
- "fields": [
- "os",
- "image",
- "placement",
- "kind",
- "runtime"
- ],
- "placements": [
- "auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
- "---",
- "local | This Mac | Linux, on this Mac | on *",
+ "host:m-mini | Mac mini | Through the Cua relay | on",
"---",
- "host:m-mini | Mac mini | Through the Cua relay | on"
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
]
}
},
@@ -665,10 +519,6 @@
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {*On|Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {On|*Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
@@ -679,7 +529,7 @@
"- experiment:ci_runners-note note: Run GitHub Actions jobs in a fresh Space each, on this computer.",
"- experiment:tcp_shares toggle: Public TCP shares {On|*Off}",
"- experiment:tcp_shares-note note: Share a game server or another TCP service in a Space at a public address.",
- "- experiment:mobile toggle: Phone app {On|*Off}",
+ "- experiment:mobile toggle: Phone app {*On|Off}",
"- experiment:mobile-note note: Your computers answer the Cua Spaces phone app: start a task, follow the thread, review changes and get alerts.",
"- experiment:warm_pools toggle: Warm start {On|*Off}",
"- experiment:warm_pools-note note: Keep one Linux Space ready on this computer, with its coding apps installed, so the next Create from Home starts at once."
@@ -691,14 +541,17 @@
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
"---",
"local | This Mac | Linux, on this Mac | on *",
"---",
- "host:m-mini | Mac mini | Through the Cua relay | on"
+ "host:m-mini | Mac mini | Through the Cua relay | on",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
]
}
},
@@ -800,10 +653,6 @@
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {*On|Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {On|*Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
@@ -814,7 +663,7 @@
"- experiment:ci_runners-note note: Run GitHub Actions jobs in a fresh Space each, on this computer.",
"- experiment:tcp_shares toggle: Public TCP shares {On|*Off}",
"- experiment:tcp_shares-note note: Share a game server or another TCP service in a Space at a public address.",
- "- experiment:mobile toggle: Phone app {On|*Off}",
+ "- experiment:mobile toggle: Phone app {*On|Off}",
"- experiment:mobile-note note: Your computers answer the Cua Spaces phone app: start a task, follow the thread, review changes and get alerts.",
"- experiment:warm_pools toggle: Warm start {On|*Off}",
"- experiment:warm_pools-note note: Keep one Linux Space ready on this computer, with its coding apps installed, so the next Create from Home starts at once."
@@ -826,14 +675,17 @@
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
"---",
"local | This Mac | Linux, on this Mac | on *",
"---",
- "host:m-mini | Mac mini | Through the Cua relay | on"
+ "host:m-mini | Mac mini | Through the Cua relay | on",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
]
}
},
@@ -929,7 +781,7 @@
},
{
"experiments": [
- "sharing"
+ "mobile"
],
"type": "experiments-on"
}
@@ -940,10 +792,6 @@
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {On|*Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {On|*Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
@@ -954,148 +802,7 @@
"- experiment:ci_runners-note note: Run GitHub Actions jobs in a fresh Space each, on this computer.",
"- experiment:tcp_shares toggle: Public TCP shares {On|*Off}",
"- experiment:tcp_shares-note note: Share a game server or another TCP service in a Space at a public address.",
- "- experiment:mobile toggle: Phone app {On|*Off}",
- "- experiment:mobile-note note: Your computers answer the Cua Spaces phone app: start a task, follow the thread, review changes and get alerts.",
- "- experiment:warm_pools toggle: Warm start {On|*Off}",
- "- experiment:warm_pools-note note: Keep one Linux Space ready on this computer, with its coding apps installed, so the next Create from Home starts at once."
- ],
- "volumePage": null,
- "wizard": {
- "fields": [
- "os",
- "image",
- "placement",
- "kind",
- "runtime"
- ],
- "placements": [
- "auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
- "---",
- "local | This Mac | Linux, on this Mac | on *",
- "---",
- "host:m-mini | Mac mini | Through the Cua relay | on"
- ]
- }
- },
- {
- "actions": [
- "teleport: Teleport an app [arrow.down.circle] ?Teleport an app into this Space",
- "pip: Picture in picture [pip.enter] ?Picture in picture",
- "share: Share [person.badge.plus] ?Share this Space",
- "delete: Remove [trash] ?Remove from the list (destructive)",
- "open: Open [-] ?Open the desktop in its own window (primary)"
- ],
- "menu": [
- "status: No Spaces running (disabled)",
- "---",
- "open: Open Cua Spaces",
- "new-space: New Space…",
- "settings: Settings… ⌘,",
- "---",
- "quit: Quit Cua Spaces ⌘Q"
- ],
- "onboarding": {
- "done": {
- "canBack": true,
- "canSkip": false,
- "choices": [],
- "dots": "Welcome,Sign in,AI agents,Menu bar,This computer,*Done",
- "drive": null,
- "driveStorage": null,
- "launchAtLogin": "[x] Launch at login ~Keeps your Spaces and agents available after a restart.",
- "lede": "3 things are left. You can finish them now, or later from the menu bar.",
- "notice": null,
- "noticeLink": null,
- "presentations": [],
- "primary": "Start using Cua Spaces",
- "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"
- ],
- "showMark": false,
- "step": "done",
- "summary": [
- "Shows in: Notch and menu bar",
- "This computer: Opens your other computers"
- ],
- "title": "Almost done",
- "todos": [
- "[ ] Cua CLI ~Command-line tools for you and your agents. -> Install the Cua CLI",
- "[ ] Account ~Reach your computers from any computer. -> Sign in",
- "[ ] AI agents ~Let Claude Code, Codex and others use Cua. -> Connect an AI agent",
- "[ ] Cua Volume ~Shared folder: files your agents can share across your computers. -> Turn on (optional)"
- ],
- "usage": null
- },
- "pages": [
- "welcome",
- "signin",
- "agents",
- "presentation",
- "mode",
- "done"
- ]
- },
- "settings": [
- "= Settings",
- "# Account (account)",
- "- account text: [email protected] [Sign out]",
- "# Teams (teams)",
- "- teams text: Teams = Manage your team in the account app",
- "- teams-manage text: Invite people, roles and plans [Manage team] < https://app.cua.ai/team>",
- "- teams-billing text: Billing [Billing and plans] < https://app.cua.ai/billing>",
- "# General (general)",
- "- launch-at-login toggle: Launch Cua Spaces at login {*On|Off}",
- "- launch-at-login-note note: Keeps your Spaces and agents available after a restart.",
- "- notch choice: Spaces tab in the notch {*Show|Hide}",
- "- welcome text: Welcome [Show again]",
- "- tips toggle: Show tips {*On|Off}",
- "- reset-tips text: Reset tips [Reset]",
- "# Runtimes (runtimes)",
- "- runtime:container choice: Containers {*Automatic|Cua’s own|Already installed} ?Checking…",
- "- runtime:vm choice: Virtual machines {*Automatic|Cua’s own|Already installed} ?Checking…",
- "- runtime:microvm choice: MicroVMs {*Automatic|Cua’s own|Already installed} ?Checking…",
- "# Privacy (privacy)",
- "- telemetry choice: Share usage data to help improve Cua {*On|Off}",
- "- telemetry-note note: Which features you use and when something goes wrong. Linked to your account through a random ID while you're signed in. Never your files, what you type or your screen. <What is collected https://cua.ai/docs/cua-sdk/concepts/telemetry>",
- "# AI agents (agents) [Configure all detected agents] (disabled)"
- ],
- "signals": [
- {
- "action": "experiment_on",
- "experiment": "your_cloud",
- "type": "experiment"
- },
- {
- "experiments": [
- "your_cloud",
- "sharing"
- ],
- "type": "experiments-on"
- }
- ],
- "step": "your cloud on again",
- "tab": [
- "= Experiments",
- "# Experiments (experiments)",
- "- experiment:cua_volume toggle: Cua Volume {On|*Off}",
- "- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {*On|Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {*On|Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
- "- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
- "- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
- "- experiment:child_spaces toggle: Child Spaces {On|*Off}",
- "- experiment:child_spaces-note note: A Space can make Spaces of its own, inside a budget you set.",
- "- experiment:ask_first toggle: Ask first {On|*Off}",
- "- experiment:ask_first-note note: An agent asks you on a card before anything leaves its Space, such as a push to GitHub.",
- "- experiment:ci_runners toggle: CI runners {On|*Off}",
- "- experiment:ci_runners-note note: Run GitHub Actions jobs in a fresh Space each, on this computer.",
- "- experiment:tcp_shares toggle: Public TCP shares {On|*Off}",
- "- experiment:tcp_shares-note note: Share a game server or another TCP service in a Space at a public address.",
- "- experiment:mobile toggle: Phone app {On|*Off}",
+ "- experiment:mobile toggle: Phone app {*On|Off}",
"- experiment:mobile-note note: Your computers answer the Cua Spaces phone app: start a task, follow the thread, review changes and get alerts.",
"- experiment:warm_pools toggle: Warm start {On|*Off}",
"- experiment:warm_pools-note note: Keep one Linux Space ready on this computer, with its coding apps installed, so the next Create from Home starts at once."
@@ -1125,6 +832,7 @@
"actions": [
"teleport: Teleport an app [arrow.down.circle] ?Teleport an app into this Space",
"pip: Picture in picture [pip.enter] ?Picture in picture",
+ "share: Share [person.badge.plus] ?Share this Space",
"delete: Remove [trash] ?Remove from the list (destructive)",
"open: Open [-] ?Open the desktop in its own window (primary)"
],
@@ -1207,26 +915,20 @@
"signals": [
{
"action": "experiment_off",
- "experiment": "sharing",
+ "experiment": "mobile",
"type": "experiment"
},
{
- "experiments": [
- "your_cloud"
- ],
+ "experiments": [],
"type": "experiments-on"
}
],
- "step": "sharing off",
+ "step": "mobile off",
"tab": [
"= Experiments",
"# Experiments (experiments)",
"- experiment:cua_volume toggle: Cua Volume {On|*Off}",
"- experiment:cua_volume-note note: Memory and files your agents share across every Space.",
- "- experiment:your_cloud toggle: Your cloud {*On|Off}",
- "- experiment:your_cloud-note note: Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account.",
- "- experiment:sharing toggle: Sharing {On|*Off}",
- "- experiment:sharing-note note: Share a Space with other Cua accounts.",
"- experiment:secure_spaces toggle: Secure Spaces {On|*Off}",
"- experiment:secure_spaces-note note: A Space reaches the internet and nothing else on your network unless you open it.",
"- experiment:child_spaces toggle: Child Spaces {On|*Off}",
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json
index 399dcaffcc..b61626315e 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json
@@ -3,16 +3,17 @@
"frames": [
{
"on": "local",
- "step": "this Mac and your machines, no cloud while Your cloud is off",
+ "step": "this Mac, your machines and your connected cloud",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"os",
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -26,7 +27,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -57,13 +60,14 @@
"step": "an offline machine cannot be chosen",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"os",
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -77,58 +81,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
- ],
- "price": null,
- "resourceFacts": [
- "Kind: Container",
- "Architecture: ARM",
- "Disk: 2.9–6.9 GB initially; grows with use"
- ],
- "step": 0,
- "summary": [
- "System: Ubuntu 24.04",
- "Image: ghcr.io/trycua/linux:24.04",
- "Runs on: Linux, on this Mac",
- "Kind: Container",
- "Architecture: ARM",
- "Runtime: Container on this Mac (gVisor when installed)",
- "Resources: 2 cores, 4 GB memory",
- "Disk: About 3–7 GB",
- "Name: space-000000002a",
- "When ready: Open the desktop"
- ],
- "systemsOff": [
- "windows | Windows (coming soon) | Windows Spaces are coming soon on Mac. | off"
- ]
- }
- },
- {
- "on": "local",
- "step": "a hidden cloud cannot be chosen",
- "wizard": {
- "canContinue": true,
- "cloud": null,
- "fields": [
- "os",
- "image",
- "placement",
- "kind",
- "runtime"
- ],
- "kindsOff": [
- "microvm | MicroVM | | off"
- ],
- "placement": "local",
- "placementError": null,
- "placements": [
- "auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
- "---",
- "local | This Mac | Linux, on this Mac | on *",
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
"---",
- "host:m-mini | Mac mini | Through the Cua relay | on",
- "host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -159,13 +114,14 @@
"step": "the Mac mini on the relay",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"os",
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -179,7 +135,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on *",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -207,13 +165,14 @@
"step": "macOS: the Mac mini is at its limit, the Linux box is not a Mac",
"wizard": {
"canContinue": false,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"os",
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"kindsOff": [
"container | Container | | off",
@@ -228,7 +187,9 @@
"---",
"host:m-mini | Mac mini (at its limit) | Mac mini is at its limit: Apple's macOS license allows two macOS VMs per Mac. | off *",
"host:lab | lab (not a Mac) | lab cannot run macOS: it is not a Mac. | off",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | macOS on AWS needs EC2 Mac (24 h minimum); not offered. Ask your agent to deploy the macOS Tahoe 26 image on AWS and add it with cua spaces add. | on"
],
"price": null,
"resourceFacts": [
@@ -256,13 +217,14 @@
"step": "Linux again",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"os",
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -276,7 +238,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on *",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -302,54 +266,6 @@
{
"on": "host:lab",
"step": "the Linux box over Tailscale",
- "wizard": {
- "canContinue": true,
- "cloud": null,
- "fields": [
- "os",
- "image",
- "placement",
- "kind",
- "runtime"
- ],
- "kindsOff": [
- "microvm | MicroVM | | off"
- ],
- "placement": "host",
- "placementError": null,
- "placements": [
- "auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
- "---",
- "local | This Mac | Linux, on this Mac | on",
- "---",
- "host:m-mini | Mac mini | Through the Cua relay | on",
- "host:lab | lab | Over Tailscale or your network | on *",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
- ],
- "price": null,
- "resourceFacts": [
- "Kind: Container",
- "Disk: 3.0–7.2 GB initially; grows with use"
- ],
- "step": 0,
- "summary": [
- "System: Ubuntu 24.04",
- "Image: ghcr.io/trycua/linux:24.04",
- "Runs on: lab",
- "Kind: Container",
- "Runtime: Container on lab",
- "Resources: 2 cores, 4 GB memory",
- "Name: space-000000002a",
- "When ready: Open the desktop"
- ],
- "systemsOff": [
- "windows | Windows (coming soon) | Windows Spaces are coming soon on Mac. | off"
- ]
- }
- },
- {
- "on": "host:lab",
- "step": "Your cloud on, AWS after your machines",
"wizard": {
"canContinue": true,
"cloud": "aws",
@@ -453,69 +369,19 @@
]
}
},
- {
- "on": "local",
- "step": "Your cloud off: this Mac again, AWS still connected",
- "wizard": {
- "canContinue": true,
- "cloud": null,
- "fields": [
- "os",
- "image",
- "placement",
- "kind",
- "runtime"
- ],
- "kindsOff": [
- "microvm | MicroVM | | off"
- ],
- "placement": "local",
- "placementError": null,
- "placements": [
- "auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
- "---",
- "local | This Mac | Linux, on this Mac | on *",
- "---",
- "host:m-mini | Mac mini | Through the Cua relay | on",
- "host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
- ],
- "price": null,
- "resourceFacts": [
- "Kind: Container",
- "Architecture: ARM",
- "Disk: 2.9–6.9 GB initially; grows with use"
- ],
- "step": 0,
- "summary": [
- "System: Ubuntu 24.04",
- "Image: ghcr.io/trycua/linux:24.04",
- "Runs on: Linux, on this Mac",
- "Kind: Container",
- "Architecture: ARM",
- "Runtime: Container on this Mac (gVisor when installed)",
- "Resources: 2 cores, 4 GB memory",
- "Disk: About 3–7 GB",
- "Name: space-000000002a",
- "When ready: Open the desktop"
- ],
- "systemsOff": [
- "windows | Windows (coming soon) | Windows Spaces are coming soon on Mac. | off"
- ]
- }
- },
{
"on": "host:m-mini",
"step": "the Mac mini again",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"os",
"image",
"placement",
"kind",
- "runtime"
+ "runtime",
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -529,7 +395,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on *",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -557,7 +425,7 @@
"step": "resources: its own size, no price",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"cpus",
"memory"
@@ -574,7 +442,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on *",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -602,7 +472,7 @@
"step": "options",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [
"name",
"open-when-ready"
@@ -619,7 +489,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on *",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -647,7 +519,7 @@
"step": "summary: runs on the Mac mini",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -661,7 +533,9 @@
"---",
"host:m-mini | Mac mini | Through the Cua relay | on *",
"host:lab | lab | Over Tailscale or your network | on",
- "host:m-studio | Studio (offline) | Studio is offline. | off"
+ "host:m-studio | Studio (offline) | Studio is offline. | off",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -689,7 +563,7 @@
"step": "the Mac mini leaves the list: this Mac again",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -697,7 +571,9 @@
"placement": "local",
"placementError": null,
"placements": [
- "local | This Mac | Linux, on this Mac | on *"
+ "local | This Mac | Linux, on this Mac | on *",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
@@ -728,7 +604,7 @@
"step": "this Mac",
"wizard": {
"canContinue": true,
- "cloud": null,
+ "cloud": "aws",
"fields": [],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -736,7 +612,9 @@
"placement": "local",
"placementError": null,
"placements": [
- "local | This Mac | Linux, on this Mac | on *"
+ "local | This Mac | Linux, on this Mac | on *",
+ "---",
+ "aws | AWS · us-west-2 | t4g.medium, about $0.04/hour | on"
],
"price": null,
"resourceFacts": [
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/placement-picker.json b/libs/cua/crates/cua-spaces-app-core/parity/placement-picker.json
index 28a78eb519..f2dcc67041 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/placement-picker.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/placement-picker.json
@@ -1,6 +1,6 @@
{
"name": "placement-picker",
- "about": "New Space's Run on menu: This Mac, then your machines that provide Spaces (a Mac mini on the relay with two of four Spaces and its two macOS VMs in use, a Linux box added by its Tailscale address, an offline studio), then, unless Your cloud is turned off, your connected cloud. Disabled entries say why (offline, at its limit, not a Mac); choosing one sets the create's on (local, host:<machine>, aws). Turning Your cloud off while AWS is chosen goes back to this Mac and leaves AWS connected; a machine that leaves the list does the same.",
+ "about": "New Space's Run on menu: This Mac, then your machines that provide Spaces (a Mac mini on the relay with two of four Spaces and its two macOS VMs in use, a Linux box added by its Tailscale address, an offline studio), then your connected cloud. Disabled entries say why (offline, at its limit, not a Mac); choosing one sets the create's on (local, host:<machine>, aws). A machine that leaves the list goes back to this Mac.",
"env": {
"defaultLocation": "local",
"localAvailable": true,
@@ -10,7 +10,6 @@
"maxCpus": 8,
"hostArch": "arm64",
"storage": null,
- "experiments": { "yourCloud": false },
"hosts": [
{
"id": "m-mini", "name": "Mac mini", "via": "relay", "online": true, "os": "macos",
@@ -33,16 +32,13 @@
]
},
"steps": [
- { "step": "this Mac and your machines, no cloud while Your cloud is off" },
+ { "step": "this Mac, your machines and your connected cloud" },
{ "step": "an offline machine cannot be chosen", "wizard": { "type": "choose-placement", "on": "host:m-studio" } },
- { "step": "a hidden cloud cannot be chosen", "wizard": { "type": "choose-placement", "on": "aws" } },
{ "step": "the Mac mini on the relay", "wizard": { "type": "choose-placement", "on": "host:m-mini" } },
{ "step": "macOS: the Mac mini is at its limit, the Linux box is not a Mac", "wizard": { "type": "choose-os", "os": "macos" } },
{ "step": "Linux again", "wizard": { "type": "choose-os", "os": "linux" } },
{ "step": "the Linux box over Tailscale", "wizard": { "type": "choose-placement", "on": "host:lab" } },
- { "step": "Your cloud on, AWS after your machines", "env": { "experiments": { "yourCloud": true } } },
{ "step": "AWS", "wizard": { "type": "choose-placement", "on": "aws" } },
- { "step": "Your cloud off: this Mac again, AWS still connected", "env": { "experiments": { "yourCloud": false } } },
{ "step": "the Mac mini again", "wizard": { "type": "choose-placement", "on": "host:m-mini" } },
{ "step": "resources: its own size, no price", "wizard": { "type": "next" } },
{ "step": "options", "wizard": { "type": "next" } },
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/your-cloud.json b/libs/cua/crates/cua-spaces-app-core/parity/your-cloud.json
index cb6b70e21c..3883c17dee 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/your-cloud.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/your-cloud.json
@@ -1,6 +1,6 @@
{
"name": "your-cloud",
- "about": "Your cloud (with its experiment on): no cloud in the Run on menu while nothing is connected, the Connect a cloud sheet (the found provider, what each provider touches, a region and profile, Hetzner's masked API token field, Test that creates nothing, a failed then a passed test, Make default, Connect, and No cloud leaving an already-connected cloud as is), then the wizard with AWS connected (its label in the Run on menu, systems and kinds it cannot run greyed out with why, the machine, cost and lifetime on Resources, the create on aws) and a second cloud as its own entry.",
+ "about": "Your cloud: no cloud in the Run on menu while nothing is connected, the Connect a cloud sheet (the found provider, what each provider touches, a region and profile, Hetzner's masked API token field, Test that creates nothing, a failed then a passed test, Make default, Connect, and No cloud leaving an already-connected cloud as is), then the wizard with AWS connected (its label in the Run on menu, systems and kinds it cannot run greyed out with why, the machine, cost and lifetime on Resources, the create on aws) and a second cloud as its own entry.",
"env": {
"defaultLocation": "local",
"localAvailable": true,
@@ -10,8 +10,7 @@
"maxCpus": 8,
"hostArch": "arm64",
"storage": null,
- "clouds": [],
- "experiments": { "yourCloud": true }
+ "clouds": []
},
"sheet": {
"providers": [
diff --git a/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs b/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs
index d80f9a531e..a30d8ab9b6 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs
@@ -526,32 +526,20 @@ pub fn call_value(method: &str, args: Value) -> Result<Value, CoreError> {
&a.get::<Option<String>>("query")?.unwrap_or_default(),
&a.get::<Option<String>>("selectedId")?.unwrap_or_default(),
)),
- // With `experiments`, what Settings, Experiments hides is left out;
- // with `access` (this device is signed in but not enrolled), the
- // detail as this device sees it (`detail_for`, as the SwiftUI app's
- // `AppModel.detail`).
+ // The detail as this device sees it (`detail_for`, as the SwiftUI
+ // app's `AppModel.detail`); with `access` (this device is signed in
+ // but not enrolled), the machines on the relay say why they are off.
"sidebar.detail" => {
let space = a.get("space")?;
let usage = a.get::<Option<sidebar::SpaceUsage>>("usage")?;
let host_arch = a.get::<Option<String>>("hostArch")?;
let access = a.get::<Option<devices::MachineAccessNotice>>("access")?;
- out(
- match (
- a.get::<Option<experiments::Experiments>>("experiments")?,
- access,
- ) {
- (None, None) => {
- sidebar::detail_live(&space, usage.as_ref(), host_arch.as_deref())
- }
- (x, access) => sidebar::detail_for(
- &space,
- usage.as_ref(),
- host_arch.as_deref(),
- &x.unwrap_or_default(),
- access.as_ref(),
- ),
- },
- )
+ out(sidebar::detail_for(
+ &space,
+ usage.as_ref(),
+ host_arch.as_deref(),
+ access.as_ref(),
+ ))
}
"sidebar.detailCopy" => out(sidebar::detail_copy()),
"sidebar.deleteFailedText" => out(sidebar::delete_failed_text(
@@ -2015,7 +2003,7 @@ mod tests {
/// out under the notice; one that keeps its desktop private says so,
/// and Share follows Settings, Experiments.
#[test]
- fn the_detail_follows_access_and_experiments() {
+ fn the_detail_follows_access() {
let space = |id: &str, features: &[&str]| {
call_value(
"spaces.rowToSpace",
@@ -2044,22 +2032,9 @@ mod tests {
.collect()
};
let has = |d: &Value, id: &str| ids(d).iter().any(|(a, _)| a == id);
- // No experiments, no access: every action, as before.
+ // No access: every action.
let live = call_value("sidebar.detail", json!({ "space": shared })).unwrap();
assert!(has(&live, "share"));
- // Sharing off hides Share; on shows it.
- let off = call_value(
- "sidebar.detail",
- json!({ "space": shared, "experiments": { "sharing": false } }),
- )
- .unwrap();
- assert!(!has(&off, "share"));
- let on = call_value(
- "sidebar.detail",
- json!({ "space": shared, "experiments": { "sharing": true } }),
- )
- .unwrap();
- assert!(has(&on, "share") && on.get("access").is_none());
// Not enrolled: the notice, Status says why, connection actions off.
let notice = serde_json::to_value(
devices::machine_access_notice(devices::EnrollmentKind::NeedsEnrollment, None).unwrap(),
@@ -2067,7 +2042,7 @@ mod tests {
.unwrap();
let d = call_value(
"sidebar.detail",
- json!({ "space": shared, "experiments": { "sharing": true }, "access": notice }),
+ json!({ "space": shared, "access": notice }),
)
.unwrap();
assert_eq!(d["access"], notice);
@@ -2078,21 +2053,10 @@ mod tests {
assert!(!enabled, "{id} stays off while not enrolled");
}
}
- // Without experiments, `access` still applies.
- let d = call_value(
- "sidebar.detail",
- json!({ "space": shared, "access": notice }),
- )
- .unwrap();
- assert_eq!(d["access"], notice);
// A machine that keeps its desktop private: its note, no New Space
// button word in the note itself, its desktop actions gone.
let private = space("relay:m1", &["host_spaces", "files"]);
- let d = call_value(
- "sidebar.detail",
- json!({ "space": private, "experiments": {} }),
- )
- .unwrap();
+ let d = call_value("sidebar.detail", json!({ "space": private })).unwrap();
assert_eq!(
d["desktopNote"],
json!("Studio isn\u{2019}t sharing its desktop. You can still create Spaces on it.")
diff --git a/libs/cua/crates/cua-spaces-app-core/src/experiments.rs b/libs/cua/crates/cua-spaces-app-core/src/experiments.rs
index ede6d7478f..fc02c64df8 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/experiments.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/experiments.rs
@@ -2,18 +2,10 @@
// Copyright (c) 2026 Cua AI, Inc.
//! Settings, Experiments: features still being built, one switch each, all
-//! off by default except Sharing (on, as cua.ai/pricing lists it for every
-//! plan) and Your cloud (on, so a linked cloud shows under Run on).
+//! off by default.
//!
//! - Cua Volume ([`Experiment::CuaVolume`]): the first run's Volume page
//! (and its Done line) and Settings' Storage section;
-//! - Your cloud ([`Experiment::YourCloud`]): the New Space wizard's
-//! connected clouds (AWS, Google Cloud, Hetzner, Modal), "Connect a cloud…" and a
-//! default location in a cloud;
-//! - Sharing ([`Experiment::Sharing`]): a Space's Share button;
-//! - New UI ([`Experiment::WebUi`]): retired. The shared web UI is the only
-//! UI of every shell, so it has no row; the key stays so the macOS shell
-//! can report it ([`crate::settings::resolve_new_ui`]).
//! - Secure Spaces ([`Experiment::SecureSpaces`]) and Child Spaces
//! ([`Experiment::ChildSpaces`]) and CI runners ([`Experiment::CiRunners`]): enforced, not only hidden. Their switches
//! are also kept in the cua home, where the daemon and `cua experiments`
@@ -32,8 +24,8 @@
//! the switch on again shows them as they are.
//!
//! The switches live in the app's settings ([`crate::settings::AppSettings`],
-//! `experiments`): one key per experiment, missing keys read as their default (off, but on for Sharing and
-//! Your cloud) and unknown ones are ignored, so an older or newer build reads the file.
+//! `experiments`): one key per experiment, missing keys read as off
+//! and unknown ones are ignored, so an older or newer build reads the file.
use serde::{Deserialize, Serialize};
@@ -42,19 +34,11 @@ use crate::settings::{
};
/// The switches, as stored (`"experiments": {"cuaVolume": true}`).
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", default)]
pub struct Experiments {
/// Cua Volume in the first run and Settings, Storage.
pub cua_volume: bool,
- /// Your own clouds in the New Space wizard.
- pub your_cloud: bool,
- /// Sharing a Space with other accounts. On unless turned off: a missing
- /// key reads as on (the plans on cua.ai/pricing list sharing).
- pub sharing: bool,
- /// The shared web UI is the main window. Always on in the macOS shell
- /// ([`crate::settings::resolve_new_ui`]); kept for older files and builds.
- pub web_ui: bool,
/// Secure Spaces: a Space reaches the internet and nothing else on the
/// network unless it is opened. Off unless turned on; the daemon enforces
/// it (the switch is kept in the cua home).
@@ -84,36 +68,12 @@ pub struct Experiments {
pub warm_pools: bool,
}
-impl Default for Experiments {
- fn default() -> Self {
- Self {
- cua_volume: false,
- your_cloud: true,
- sharing: true,
- web_ui: false,
- secure_spaces: false,
- child_spaces: false,
- ask_first: false,
- ci_runners: false,
- tcp_shares: false,
- mobile: false,
- warm_pools: false,
- }
- }
-}
-
/// One experiment.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[serde(rename_all = "snake_case")]
pub enum Experiment {
/// Cua Volume.
CuaVolume,
- /// Your cloud.
- YourCloud,
- /// Sharing.
- Sharing,
- /// New UI (preview).
- WebUi,
/// Secure Spaces.
SecureSpaces,
/// Child Spaces.
@@ -131,11 +91,8 @@ pub enum Experiment {
}
/// Every experiment, in the order Settings lists them.
-pub const ALL: [Experiment; 11] = [
+pub const ALL: [Experiment; 8] = [
Experiment::CuaVolume,
- Experiment::YourCloud,
- Experiment::Sharing,
- Experiment::WebUi,
Experiment::SecureSpaces,
Experiment::ChildSpaces,
Experiment::AskFirst,
@@ -146,14 +103,11 @@ pub const ALL: [Experiment; 11] = [
];
impl Experiment {
- /// The stable id (`cua_volume`, `your_cloud`, `sharing`, `web_ui`): the Settings
+ /// The stable id (`cua_volume`, `secure_spaces`, ...): the Settings
/// row's suffix and the telemetry word.
pub fn id(self) -> &'static str {
match self {
Experiment::CuaVolume => "cua_volume",
- Experiment::YourCloud => "your_cloud",
- Experiment::Sharing => "sharing",
- Experiment::WebUi => "web_ui",
Experiment::SecureSpaces => "secure_spaces",
Experiment::ChildSpaces => "child_spaces",
Experiment::AskFirst => "ask_first",
@@ -173,9 +127,6 @@ impl Experiment {
pub fn title(self) -> &'static str {
match self {
Experiment::CuaVolume => "Cua Volume",
- Experiment::YourCloud => "Your cloud",
- Experiment::Sharing => "Sharing",
- Experiment::WebUi => "New UI",
Experiment::SecureSpaces => "Secure Spaces",
Experiment::ChildSpaces => "Child Spaces",
Experiment::AskFirst => "Ask first",
@@ -190,11 +141,6 @@ impl Experiment {
pub fn description(self) -> &'static str {
match self {
Experiment::CuaVolume => "Memory and files your agents share across every Space.",
- Experiment::YourCloud => {
- "Create Spaces in your own AWS, Google Cloud, Hetzner or Modal account."
- }
- Experiment::Sharing => "Share a Space with other Cua accounts.",
- Experiment::WebUi => "The Spaces window built on the shared web UI.",
Experiment::SecureSpaces => {
"A Space reaches the internet and nothing else on your network unless you open it."
}
@@ -225,9 +171,6 @@ impl Experiments {
pub fn is_on(&self, e: Experiment) -> bool {
match e {
Experiment::CuaVolume => self.cua_volume,
- Experiment::YourCloud => self.your_cloud,
- Experiment::Sharing => self.sharing,
- Experiment::WebUi => self.web_ui,
Experiment::SecureSpaces => self.secure_spaces,
Experiment::ChildSpaces => self.child_spaces,
Experiment::AskFirst => self.ask_first,
@@ -242,9 +185,6 @@ impl Experiments {
pub fn with(mut self, e: Experiment, on: bool) -> Self {
match e {
Experiment::CuaVolume => self.cua_volume = on,
- Experiment::YourCloud => self.your_cloud = on,
- Experiment::Sharing => self.sharing = on,
- Experiment::WebUi => self.web_ui = on,
Experiment::SecureSpaces => self.secure_spaces = on,
Experiment::ChildSpaces => self.child_spaces = on,
Experiment::AskFirst => self.ask_first = on,
@@ -276,7 +216,7 @@ pub fn row_id(e: Experiment) -> String {
format!("experiment:{}", e.id())
}
-/// The experiment a Settings row id names (`experiment:sharing`).
+/// The experiment a Settings row id names (`experiment:cua_volume`).
pub fn of_row(id: &str) -> Option<Experiment> {
id.strip_prefix("experiment:").and_then(Experiment::parse)
}
@@ -285,10 +225,6 @@ pub fn of_row(id: &str) -> Option<Experiment> {
pub fn page(experiments: &Experiments) -> SettingsPage {
let mut rows = Vec::new();
for e in ALL {
- if e == Experiment::WebUi {
- // Retired: the web UI is the only UI, so there is nothing to choose.
- continue;
- }
let on = experiments.is_on(e);
let mut toggle = crate::settings::row(&row_id(e), SettingsRowKind::Toggle, e.title());
toggle.options = vec![
@@ -324,10 +260,9 @@ pub fn page(experiments: &Experiments) -> SettingsPage {
}
/// The switches after a row's choice (`on` or `off`); unchanged for any
-/// other row or option, and for the retired New UI rows
-/// (`experiment:web_ui`, `experiment:classic_ui`).
+/// other row or option.
pub fn choose(experiments: &Experiments, row: &str, option: &str) -> Experiments {
- match (of_row(row).filter(|e| *e != Experiment::WebUi), option) {
+ match (of_row(row), option) {
(Some(e), "on") => experiments.with(e, true),
(Some(e), "off") => experiments.with(e, false),
_ => *experiments,
@@ -348,7 +283,7 @@ mod tests {
use super::*;
#[test]
- fn every_experiment_but_sharing_and_your_cloud_is_off_by_default_with_one_line_each() {
+ fn every_experiment_is_off_by_default_with_one_line_each() {
let p = page(&Experiments::default());
assert_eq!(p.title, "Experiments");
let ids: Vec<&str> = p.sections[0].rows.iter().map(|r| r.id.as_str()).collect();
@@ -357,10 +292,6 @@ mod tests {
[
"experiment:cua_volume",
"experiment:cua_volume-note",
- "experiment:your_cloud",
- "experiment:your_cloud-note",
- "experiment:sharing",
- "experiment:sharing-note",
"experiment:secure_spaces",
"experiment:secure_spaces-note",
"experiment:child_spaces",
@@ -378,13 +309,8 @@ mod tests {
]
);
for r in switches(&p) {
- let shown = if r.id == "experiment:sharing" || r.id == "experiment:your_cloud" {
- "on"
- } else {
- "off"
- };
assert!(
- r.options.iter().any(|o| o.id == shown && o.active),
+ r.options.iter().any(|o| o.id == "off" && o.active),
"{}",
r.id
);
@@ -398,25 +324,18 @@ mod tests {
#[test]
fn a_switch_turns_one_experiment_on_and_off() {
- let off = Experiments {
- sharing: false,
- ..Default::default()
- };
- let x = choose(&off, "experiment:sharing", "on");
- assert_eq!(x, Experiments::default());
- assert_eq!(x.on_ids(), ["your_cloud", "sharing"]);
- assert_eq!(choose(&x, "experiment:sharing", "off"), off);
- let v = choose(&x, "experiment:cua_volume", "on");
- assert_eq!(v.on_ids(), ["cua_volume", "your_cloud", "sharing"]);
+ let off = Experiments::default();
+ let x = choose(&off, "experiment:cua_volume", "on");
+ assert_eq!(x.on_ids(), ["cua_volume"]);
+ assert_eq!(choose(&x, "experiment:cua_volume", "off"), off);
+ let v = choose(&x, "experiment:mobile", "on");
+ assert_eq!(v.on_ids(), ["cua_volume", "mobile"]);
assert_eq!(choose(&x, "notch", "on"), x, "other rows change nothing");
assert_eq!(choose(&x, "experiment:nope", "on"), x);
assert_eq!(
Experiments::all_on().on_ids(),
[
"cua_volume",
- "your_cloud",
- "sharing",
- "web_ui",
"secure_spaces",
"child_spaces",
"ask_first",
@@ -428,46 +347,20 @@ mod tests {
);
}
- #[test]
- fn the_retired_new_ui_rows_are_gone_and_change_nothing() {
- let on = Experiments {
- web_ui: true,
- ..Default::default()
- };
- for x in [on, Experiments::default()] {
- let p = page(&x);
- assert!(
- p.sections[0]
- .rows
- .iter()
- .all(|r| !r.id.contains("classic_ui") && !r.id.contains("web_ui")),
- "no New UI row"
- );
- for row in ["experiment:classic_ui", "experiment:web_ui"] {
- for option in ["on", "off"] {
- assert_eq!(choose(&x, row, option), x, "{row} {option}");
- }
- }
- }
- }
-
#[test]
fn stored_keys_are_forward_compatible() {
- let x: Experiments =
- serde_json::from_str(r#"{"cuaVolume":true,"someFutureExperiment":true}"#).unwrap();
- assert!(x.cua_volume && x.your_cloud && x.sharing && !x.web_ui);
+ // Keys of switches that are gone (an older build's `yourCloud`,
+ // `sharing`, `webUi`) and of future ones are ignored.
+ let x: Experiments = serde_json::from_str(
+ r#"{"cuaVolume":true,"yourCloud":false,"sharing":false,"webUi":true,"someFutureExperiment":true}"#,
+ )
+ .unwrap();
+ assert!(x.cua_volume);
let back = serde_json::to_value(x).unwrap();
assert_eq!(
back,
- serde_json::json!({"cuaVolume": true, "yourCloud": true, "sharing": true, "webUi": false, "secureSpaces": false, "childSpaces": false, "askFirst": false, "ciRunners": false, "tcpShares": false, "mobile": false, "warmPools": false})
+ serde_json::json!({"cuaVolume": true, "secureSpaces": false, "childSpaces": false, "askFirst": false, "ciRunners": false, "tcpShares": false, "mobile": false, "warmPools": false})
);
- // An explicit off is kept.
- let off: Experiments = serde_json::from_str(r#"{"yourCloud":false}"#).unwrap();
- assert!(!off.your_cloud);
- // Sharing is on unless the key says off (a missing key is not off).
- let off: Experiments = serde_json::from_str(r#"{"sharing":false}"#).unwrap();
- assert!(!off.sharing);
- assert!(Experiments::default().sharing);
assert_eq!(
serde_json::from_str::<Experiments>("{}").unwrap(),
Experiments::default()
diff --git a/libs/cua/crates/cua-spaces-app-core/src/parity.rs b/libs/cua/crates/cua-spaces-app-core/src/parity.rs
index c57c69ac6f..8f7b7d02c5 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/parity.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/parity.rs
@@ -5082,9 +5082,8 @@ fn run_your_cloud(f: &Value, h: &dyn Host) -> Result<Value, String> {
/// Settings, Experiments: the tab and what every switch decides, after
/// each change (`changes`: a row's choice). Each frame has the tab, the
/// events the change sends, Settings (Storage only with Cua Volume), the
-/// first run's pages and its Done page, a Space's buttons (Share only with
-/// Sharing) and New Space's Run on menu and links (clouds only with Your
-/// cloud).
+/// first run's pages and its Done page, a Space's buttons and New Space's
+/// Run on menu and links.
fn run_experiments(f: &Value, h: &dyn Host) -> Result<Value, String> {
let storage_state = c(h, "storage.initial", json!({}))?;
let storage = c(
@@ -5159,11 +5158,7 @@ fn experiments_frame(
}
}
let done = c(h, "onboarding.view", json!({ "state": st }))?;
- let detail = c(
- h,
- "sidebar.detail",
- json!({ "space": space, "experiments": x }),
- )?;
+ let detail = c(h, "sidebar.detail", json!({ "space": space }))?;
let chrome = c(h, "window.chrome", json!({ "input": { "experiments": x } }))?;
let mut menu_input = f["menu"].clone();
menu_input["experiments"] = x.clone();
@@ -5196,7 +5191,7 @@ fn experiments_frame(
}
/// New Space's Run on menu: This Mac, your machines (offline and at a limit
-/// say why) and, with the Your cloud experiment, your clouds. A step may
+/// say why) and your clouds. A step may
/// patch the wizard's env (`env`: the experiments, the hosts) before its
/// action; each frame is the wizard and the create's `on`.
fn run_placement_picker(f: &Value, h: &dyn Host) -> Result<Value, String> {
diff --git a/libs/cua/crates/cua-spaces-app-core/src/settings.rs b/libs/cua/crates/cua-spaces-app-core/src/settings.rs
index b6a52b84cb..4b5ec08a04 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/settings.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/settings.rs
@@ -64,15 +64,8 @@ pub struct AppSettings {
/// Settings); `None`: never chosen ([`crate::login_item::launch_plan`]).
pub launch_at_login: Option<bool>,
/// Settings, Experiments: every switch off unless turned on
- /// ([`crate::experiments`]). Its `webUi` is always on in the macOS
- /// shell ([`resolve_new_ui`]); the file keeps only [`Self::new_ui`]'s
- /// "on" there, the value older builds read.
+ /// ([`crate::experiments`]).
pub experiments: Experiments,
- /// The New UI as an older build's "Use classic UI" saved it. Read and
- /// kept for those builds, never acted on: the web UI is the only UI
- /// ([`resolve_new_ui`]). An older build's saved `webUi: true` reads as
- /// `Some(true)`; its `false` was only the saved default ([`load`]).
- pub new_ui: Option<bool>,
/// Keyvault copies (import ids) the user dismissed from the notch: it no
/// longer shows them, nothing is revoked or wiped
/// ([`crate::keyvault::view::prune_dismissed`] forgets the gone ones).
@@ -127,7 +120,6 @@ impl Default for AppSettings {
update_channel: UpdateChannel::Stable,
launch_at_login: None,
experiments: Experiments::default(),
- new_ui: None,
dismissed_access: vec![],
notch_pinned: vec![],
keyvault_site_icons: true,
@@ -146,12 +138,6 @@ impl Default for AppSettings {
/// file (not valid settings JSON) is kept beside it as
/// `<name>.damaged` before the shell saves the defaults over it, so a
/// person's settings are never lost without a copy.
-///
-/// The New UI: a file with no choice yet ([`AppSettings::new_ui`]) takes an
-/// older build's `experiments.webUi: true` as the choice and its `false`
-/// as no choice (every older install saved `false` without anyone choosing
-/// it). Until [`resolve_new_ui`] runs with the app's version, the New UI
-/// is on only by choice.
pub fn load(path: &Path) -> AppSettings {
let text = std::fs::read_to_string(path).ok();
let parsed = text.as_deref().map(serde_json::from_str::<AppSettings>);
@@ -169,13 +155,7 @@ pub fn load(path: &Path) -> AppSettings {
),
}
}
- let mut s: AppSettings = parsed.and_then(Result::ok).unwrap_or_default();
- migrate_defaults(path, &mut s);
- if s.new_ui.is_none() && s.experiments.web_ui {
- s.new_ui = Some(true);
- }
- s.experiments.web_ui = s.new_ui == Some(true);
- s
+ parsed.and_then(Result::ok).unwrap_or_default()
}
/// Where a damaged settings file is kept (`settings.json.damaged`).
@@ -185,76 +165,6 @@ pub fn damaged_path(path: &Path) -> std::path::PathBuf {
path.with_file_name(name)
}
-/// The migration marker next to the settings file. The shells round-trip
-/// [`AppSettings`] through their own mirrors, so the marker lives in a file of
-/// its own that no shell rewrites.
-fn migrations_path(path: &Path) -> std::path::PathBuf {
- path.with_file_name("settings-migrations.json")
-}
-
-/// Defaults that turned on after releases saved them as off, and switches
-/// that were retired (Settings, Advanced no longer has a Sharing or a Your
-/// cloud switch). Each one has a key in the migration marker.
-const MIGRATIONS: [&str; 4] = [
- "sharingDefaultOn",
- "yourCloudDefaultOn",
- "sharingSwitchRetired",
- "yourCloudSwitchRetired",
-];
-
-/// Sharing became on by default in 0.9.1 (CUA-1668) and Your cloud later
-/// (a linked cloud showed under Run on only after digging into Settings).
-/// Earlier builds saved `false` for anyone who toggled any experiment,
-/// without them choosing it, and left no record of an explicit choice. The
-/// first load without a switch's marker turns a stored `false` on once and
-/// writes the marker (also on a fresh install, so a later "off" is never
-/// overridden); from then on the stored value is the user's. A missing key
-/// already reads as on. Best effort: a failed write only repeats the
-/// migration on the next load.
-fn migrate_defaults(path: &Path, s: &mut AppSettings) {
- let marker = migrations_path(path);
- let mut done: serde_json::Map<String, serde_json::Value> = std::fs::read_to_string(&marker)
- .ok()
- .and_then(|m| serde_json::from_str(&m).ok())
- .unwrap_or_default();
- let pending = |k: &str| done.get(k) != Some(&serde_json::Value::Bool(true));
- if !MIGRATIONS.iter().any(|k| pending(k)) {
- return;
- }
- // The retired switches: with no switch to turn them back on, a stored
- // `false` (a choice nobody can make or undo any more) reads as on, once.
- // The plan decides who can share or use a cloud, on the server.
- let turn_sharing_on =
- (pending(MIGRATIONS[0]) || pending(MIGRATIONS[2])) && !s.experiments.sharing;
- let turn_cloud_on =
- (pending(MIGRATIONS[1]) || pending(MIGRATIONS[3])) && !s.experiments.your_cloud;
- if turn_sharing_on || turn_cloud_on {
- s.experiments.sharing |= turn_sharing_on;
- s.experiments.your_cloud |= turn_cloud_on;
- if path.exists() && save(path, s).is_err() {
- return;
- }
- }
- for k in MIGRATIONS {
- done.insert(k.into(), true.into());
- }
- if let Some(dir) = marker.parent() {
- let _ = std::fs::create_dir_all(dir);
- }
- let _ = std::fs::write(&marker, serde_json::Value::Object(done).to_string());
-}
-
-/// `settings` with the New UI as this launch shows it: always on. The shared
-/// web UI is the only UI of the macOS app (the SwiftUI views are gone), so an
-/// older build's "Use classic UI" choice ([`AppSettings::new_ui`] `false`)
-/// no longer applies: that install opens the web UI like every other one.
-/// `version` is unused, kept for the shells' binding.
-pub fn resolve_new_ui(settings: &AppSettings, _version: &str) -> AppSettings {
- let mut s = settings.clone();
- s.experiments.web_ui = true;
- s
-}
-
/// The update channel of an install's first launch, from the one in the
/// settings file (`channel`): Nightly for any prerelease (a nightly, or a
/// beta from before Nightly: someone who installed one keeps getting the
@@ -275,18 +185,14 @@ pub fn choose_experiment(settings: &AppSettings, row: &str, option: &str) -> App
s
}
-/// Writes settings atomically (temp file, then rename). The New UI is
-/// saved as chosen ([`AppSettings::new_ui`]), never as its default: the
-/// default follows the version and channel of each launch.
+/// Writes settings atomically (temp file, then rename).
pub fn save(path: &Path, settings: &AppSettings) -> Result<(), CoreError> {
- let mut stored = settings.clone();
- stored.experiments.web_ui = stored.new_ui == Some(true);
- let mut value = serde_json::to_value(&stored).map_err(|e| CoreError::Io(e.to_string()))?;
+ let mut value = serde_json::to_value(settings).map_err(|e| CoreError::Io(e.to_string()))?;
// Nightly is stored as `beta`, its old name: a release from before
// Nightly (someone going back to Stable by hand) reads the whole file
// with serde and starts over with the defaults on a word it does not
// know. This build reads `beta` as Nightly ([`UpdateChannel`]).
- if stored.update_channel == UpdateChannel::Nightly
+ if settings.update_channel == UpdateChannel::Nightly
&& let Some(o) = value.as_object_mut()
{
o.insert("updateChannel".into(), STORED_NIGHTLY.into());
@@ -1458,56 +1364,6 @@ mod tests {
assert_eq!(old.experiments, Experiments::default());
}
- /// A settings file in a fresh temp dir.
- fn temp_settings(name: &str) -> (std::path::PathBuf, std::path::PathBuf) {
- let dir =
- std::env::temp_dir().join(format!("cua-app-core-new-ui-{name}-{}", std::process::id()));
- let _ = std::fs::remove_dir_all(&dir);
- std::fs::create_dir_all(&dir).unwrap();
- let path = dir.join("settings.json");
- (dir, path)
- }
-
- #[test]
- fn the_web_ui_is_on_for_every_install_whatever_an_older_build_saved() {
- let (dir, path) = temp_settings("web-only");
- // "Use classic UI" on (an older build's choice), a never-chosen
- // `webUi: false`, a chosen `true`, no file: the web UI every time,
- // on either channel and any version.
- for raw in [
- Some(r#"{"updateChannel":"stable","newUi":false,"experiments":{"webUi":false}}"#),
- Some(r#"{"updateChannel":"beta","experiments":{"cuaVolume":true,"webUi":false}}"#),
- Some(r#"{"experiments":{"webUi":true}}"#),
- None,
- ] {
- match raw {
- Some(raw) => std::fs::write(&path, raw).unwrap(),
- None => {
- let _ = std::fs::remove_file(&path);
- }
- }
- for version in ["0.7.2", "0.8.0", "0.16.1", "dev", ""] {
- assert!(
- resolve_new_ui(&load(&path), version).experiments.web_ui,
- "{raw:?} {version}"
- );
- }
- }
- // The retired rows change nothing, and leave the old choice alone.
- let s = AppSettings {
- new_ui: Some(false),
- ..Default::default()
- };
- for row in ["experiment:classic_ui", "experiment:web_ui"] {
- for option in ["on", "off"] {
- let after = choose_experiment(&s, row, option);
- assert_eq!(after.new_ui, Some(false));
- assert_eq!(after.experiments, s.experiments);
- }
- }
- let _ = std::fs::remove_dir_all(dir);
- }
-
#[test]
fn a_prerelease_installs_first_launch_is_on_nightly() {
use UpdateChannel::{Nightly, Stable};
@@ -1580,128 +1436,4 @@ mod tests {
assert_eq!(load(&path).update_channel, UpdateChannel::Stable);
let _ = std::fs::remove_dir_all(dir);
}
-
- #[test]
- fn sharing_on_by_default_migrates_a_0_9_0_false_once() {
- // Fresh install: on, and an "off" afterwards survives restarts.
- let (dir, path) = temp_settings("sharing-fresh");
- let s = load(&path);
- assert!(s.experiments.sharing);
- let off = choose_experiment(&s, "experiment:sharing", "off");
- save(&path, &off).unwrap();
- assert!(!load(&path).experiments.sharing);
- assert!(!load(&path).experiments.sharing, "and again");
- let _ = std::fs::remove_dir_all(dir);
-
- // 0.9.0: toggling any experiment saved sharing false, no marker.
- let (dir, path) = temp_settings("sharing-090");
- std::fs::write(
- &path,
- r#"{"experiments":{"cuaVolume":true,"sharing":false}}"#,
- )
- .unwrap();
- let s = load(&path);
- assert!(s.experiments.sharing && s.experiments.cua_volume);
- let raw: serde_json::Value =
- serde_json::from_str(&std::fs::read_to_string(&path).unwrap()).unwrap();
- assert_eq!(raw["experiments"]["sharing"], true, "persisted");
- // The user turns it off in 0.9.1: stays off across restarts.
- save(&path, &choose_experiment(&s, "experiment:sharing", "off")).unwrap();
- assert!(!load(&path).experiments.sharing);
- assert!(!load(&path).experiments.sharing);
- assert!(load(&path).experiments.cua_volume);
- let _ = std::fs::remove_dir_all(dir);
-
- // 0.9.0 settings with sharing already true stay true.
- let (dir, path) = temp_settings("sharing-true");
- std::fs::write(&path, r#"{"experiments":{"sharing":true}}"#).unwrap();
- assert!(load(&path).experiments.sharing);
- let _ = std::fs::remove_dir_all(dir);
- }
-
- #[test]
- fn your_cloud_on_by_default_migrates_a_stored_false_once() {
- // Fresh install: on, and an "off" afterwards survives restarts.
- let (dir, path) = temp_settings("cloud-fresh");
- let s = load(&path);
- assert!(s.experiments.your_cloud);
- save(
- &path,
- &choose_experiment(&s, "experiment:your_cloud", "off"),
- )
- .unwrap();
- assert!(!load(&path).experiments.your_cloud);
- assert!(!load(&path).experiments.your_cloud, "and again");
- let _ = std::fs::remove_dir_all(dir);
-
- // No value stored: on. An older build's saved false (no marker for
- // it, though the sharing marker exists): on once, then the user's.
- let (dir, path) = temp_settings("cloud-old");
- std::fs::write(&path, r#"{"experiments":{"cuaVolume":true}}"#).unwrap();
- std::fs::write(
- path.with_file_name("settings-migrations.json"),
- r#"{"sharingDefaultOn":true,"sharingSwitchRetired":true}"#,
- )
- .unwrap();
- assert!(load(&path).experiments.your_cloud, "never set reads as on");
- std::fs::write(
- &path,
- r#"{"experiments":{"yourCloud":false,"sharing":false}}"#,
- )
- .unwrap();
- std::fs::remove_file(path.with_file_name("settings-migrations.json")).unwrap();
- std::fs::write(
- path.with_file_name("settings-migrations.json"),
- r#"{"sharingDefaultOn":true,"sharingSwitchRetired":true}"#,
- )
- .unwrap();
- let s = load(&path);
- assert!(s.experiments.your_cloud, "the saved default, not a choice");
- assert!(
- !s.experiments.sharing,
- "sharing's own marker kept its choice"
- );
- save(
- &path,
- &choose_experiment(&s, "experiment:your_cloud", "off"),
- )
- .unwrap();
- assert!(!load(&path).experiments.your_cloud);
- let _ = std::fs::remove_dir_all(dir);
- }
-
- #[test]
- fn the_retired_sharing_and_cloud_switches_turn_a_stored_off_on_once() {
- // Both default-on migrations already ran; the switches were still
- // there, and someone turned both off.
- let (dir, path) = temp_settings("retired");
- std::fs::write(
- &path,
- r#"{"experiments":{"cuaVolume":true,"sharing":false,"yourCloud":false},"menuBar":true}"#,
- )
- .unwrap();
- std::fs::write(
- path.with_file_name("settings-migrations.json"),
- r#"{"sharingDefaultOn":true,"yourCloudDefaultOn":true}"#,
- )
- .unwrap();
- let s = load(&path);
- assert!(s.experiments.sharing && s.experiments.your_cloud);
- // Everything else the person set is kept.
- assert!(s.experiments.cua_volume && s.menu_bar);
- let raw: serde_json::Value =
- serde_json::from_str(&std::fs::read_to_string(&path).unwrap()).unwrap();
- assert_eq!(raw["experiments"]["sharing"], true);
- assert_eq!(raw["menuBar"], true);
- // It runs once: the markers say so, and a later load changes nothing.
- let marks: serde_json::Value = serde_json::from_str(
- &std::fs::read_to_string(path.with_file_name("settings-migrations.json")).unwrap(),
- )
- .unwrap();
- assert_eq!(marks["sharingSwitchRetired"], true);
- assert_eq!(marks["yourCloudSwitchRetired"], true);
- let again = load(&path);
- assert_eq!(again.experiments, s.experiments);
- let _ = std::fs::remove_dir_all(dir);
- }
}
diff --git a/libs/cua/crates/cua-spaces-app-core/src/spaces/sidebar.rs b/libs/cua/crates/cua-spaces-app-core/src/spaces/sidebar.rs
index b44364111c..b7d3c73eaa 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/spaces/sidebar.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/spaces/sidebar.rs
@@ -1147,23 +1147,7 @@ pub fn detail_live(
}
}
-/// [`detail_live`] without what Settings, Experiments hides: the Share
-/// button while Sharing is off (a Space already shared stays shared; its
-/// people keep their access).
-pub fn detail_with(
- space: &Space,
- usage: Option<&SpaceUsage>,
- host_arch: Option<&str>,
- experiments: &crate::experiments::Experiments,
-) -> SpaceDetail {
- let mut d = detail_live(space, usage, host_arch);
- if !experiments.sharing {
- d.actions.retain(|a| a.id != DetailActionId::Share);
- }
- d
-}
-
-/// [`detail_with`] as this device sees it. `access` is why this device
+/// [`detail_live`] as this device sees it. `access` is why this device
/// cannot open the account's machines (signed in, not enrolled;
/// [`crate::devices::machine_access_notice`]): every Space reached through
/// the relay then shows its Connect greyed out under that line, says why
@@ -1175,10 +1159,9 @@ pub fn detail_for(
space: &Space,
usage: Option<&SpaceUsage>,
host_arch: Option<&str>,
- experiments: &crate::experiments::Experiments,
access: Option<&crate::devices::MachineAccessNotice>,
) -> SpaceDetail {
- let mut d = detail_with(space, usage, host_arch, experiments);
+ let mut d = detail_live(space, usage, host_arch);
let connection = [
DetailActionId::Teleport,
DetailActionId::Pip,
@@ -1268,7 +1251,6 @@ mod tests {
/// not read this Space's agents").
#[test]
fn this_machines_desktop_says_why_instead_of_loading_forever() {
- use crate::experiments::Experiments;
use crate::host::{HostSummaryInput, this_machine_space};
use crate::model::{SpaceOs, SpaceSdkRef};
let sharing = HostSummaryInput {
@@ -1287,10 +1269,7 @@ mod tests {
reachable: true,
error: None,
});
- for d in [
- detail(&host),
- detail_for(&host, None, None, &Experiments::default(), None),
- ] {
+ for d in [detail(&host), detail_for(&host, None, None, None)] {
assert!(d.is_host);
assert!(!d.can_stream);
assert!(!d.show_sections, "no Stream or Agents for {os:?}");
@@ -1349,36 +1328,20 @@ mod tests {
}
}
- /// Sharing on (the default): Share, between
- /// Picture in picture and Delete as before; off: no Share button.
+ /// Share sits between Picture in picture and Delete.
#[test]
- fn the_sharing_experiment_decides_the_share_button() {
- use crate::experiments::Experiments;
+ fn the_share_button_is_always_offered() {
let s = super::super::row_to_space(&local_row("local:a", None, None, None), 0);
- let ids = |e: &Experiments| -> Vec<DetailActionId> {
- detail_with(&s, None, None, e)
- .actions
- .iter()
- .map(|a| a.id)
- .collect()
- };
- assert!(
- !ids(&Experiments {
- sharing: false,
- ..Default::default()
- })
- .contains(&DetailActionId::Share)
- );
- let on = ids(&Experiments::default());
+ let on: Vec<DetailActionId> = detail_live(&s, None, None)
+ .actions
+ .iter()
+ .map(|a| a.id)
+ .collect();
assert_eq!(
on.iter().position(|a| *a == DetailActionId::Share),
Some(2),
"{on:?}"
);
- assert_eq!(
- detail_with(&s, None, None, &Experiments::all_on()),
- detail_live(&s, None, None)
- );
}
fn local_row(
@@ -1408,7 +1371,6 @@ mod tests {
/// is the row's help (in plain words), never the Status itself.
#[test]
fn an_unreachable_space_says_unreachable_with_why_as_help() {
- let x = crate::experiments::Experiments::default();
for (raw, why) in [
(
"cua-spacesd is not available: relay:studio has no cua-spacesd (gRPC: relay assertion refused)",
@@ -1421,13 +1383,13 @@ mod tests {
] {
let mut space = machine(&[], false);
space.sdk.as_mut().unwrap().error = Some(raw.into());
- let d = detail_with(&space, None, None, &x);
+ let d = detail_live(&space, None, None);
let status = fact_of(&d, "Status").unwrap();
assert_eq!(status.value, "Unreachable");
assert_eq!(status.help.as_deref(), Some(why));
}
// No error: no help.
- let d = detail_with(&machine(&[], false), None, None, &x);
+ let d = detail_live(&machine(&[], false), None, None);
assert_eq!(fact_of(&d, "Status").unwrap().value, "Unreachable");
assert_eq!(fact_of(&d, "Status").unwrap().help, None);
}
@@ -1458,10 +1420,9 @@ mod tests {
#[test]
fn a_machine_seen_from_a_device_that_is_not_enrolled() {
use crate::devices::{EnrollmentKind, machine_access_notice};
- let x = crate::experiments::Experiments::default();
let m = machine(SHARED, true);
- let enrolled = detail_for(&m, None, None, &x, None);
- assert_eq!(enrolled, detail_with(&m, None, None, &x));
+ let enrolled = detail_for(&m, None, None, None);
+ assert_eq!(enrolled, detail_live(&m, None, None));
assert!(enrolled.can_stream && enrolled.access.is_none());
for (kind, status) in [
(EnrollmentKind::NeedsEnrollment, "Not trusted yet"),
@@ -1471,7 +1432,7 @@ mod tests {
let notice = machine_access_notice(kind, Some("K7QX-M2RP")).unwrap();
// Unreachable (the relay refuses it): still listed, still explained.
for reachable in [false, true] {
- let d = detail_for(&machine(&[], reachable), None, None, &x, Some(&notice));
+ let d = detail_for(&machine(&[], reachable), None, None, Some(&notice));
assert_eq!(d.access.as_ref(), Some(&notice));
assert!(!d.can_stream && !d.show_sections && d.sections.is_empty());
assert_eq!(fact_of(&d, "Status").unwrap().value, status);
@@ -1491,7 +1452,7 @@ mod tests {
let local = super::super::row_to_space(&local_row("local:a", None, None, None), 0);
let notice = machine_access_notice(EnrollmentKind::NeedsEnrollment, None).unwrap();
assert!(
- detail_for(&local, None, None, &x, Some(&notice))
+ detail_for(&local, None, None, Some(&notice))
.access
.is_none()
);
@@ -1503,15 +1464,14 @@ mod tests {
/// older one that does not say, counts as sharing.
#[test]
fn a_machine_that_does_not_share_its_desktop() {
- let x = crate::experiments::Experiments::default();
- let shared = detail_for(&machine(SHARED, true), None, None, &x, None);
+ let shared = detail_for(&machine(SHARED, true), None, None, None);
assert_eq!(shared.sections, ["Stream", "Agents", "Teleport"]);
assert!(shared.desktop_note.is_none() && shared.new_space.is_none());
assert_eq!(shares_desktop(&machine(SHARED, true)), Some(true));
let spaces_only = machine(&["host_spaces", "files"], true);
assert_eq!(shares_desktop(&spaces_only), Some(false));
- let d = detail_for(&spaces_only, None, None, &x, None);
+ let d = detail_for(&spaces_only, None, None, None);
assert_eq!(
d.desktop_note.as_deref(),
Some("Studio isn\u{2019}t sharing its desktop. You can still create Spaces on it.")
@@ -1529,7 +1489,7 @@ mod tests {
})
);
- let neither = detail_for(&machine(&["files"], true), None, None, &x, None);
+ let neither = detail_for(&machine(&["files"], true), None, None, None);
assert_eq!(
neither.desktop_note.as_deref(),
Some("Studio isn\u{2019}t sharing its desktop or Spaces.")
@@ -1540,7 +1500,7 @@ mod tests {
assert_eq!(shares_desktop(&machine(&["host_spaces"], false)), None);
assert_eq!(shares_desktop(&machine(&[], true)), None);
assert!(
- detail_for(&machine(&[], true), None, None, &x, None)
+ detail_for(&machine(&[], true), None, None, None)
.desktop_note
.is_none()
);
diff --git a/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs b/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs
index 37a5461f08..f20c0e1ed5 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs
@@ -176,7 +176,7 @@ pub enum TelemetrySignal {
Experiment {
/// `experiment_on` or `experiment_off`.
action: String,
- /// `cua_volume`, `your_cloud` or `sharing`.
+ /// `cua_volume`, `mobile`, ...
experiment: String,
},
/// Which experiments are on now (no event of its own: the daily
@@ -2201,29 +2201,29 @@ mod tests {
#[test]
fn an_experiment_toggle_is_one_event_and_the_set_that_is_on() {
use crate::experiments::Experiments;
- let off = Experiments {
- sharing: false,
+ let off = Experiments::default();
+ let on = Experiments {
+ mobile: true,
..Default::default()
};
- let on = Experiments::default();
let signals = experiments_changed(&off, &on);
assert_eq!(
signals,
vec![
TelemetrySignal::Experiment {
action: "experiment_on".into(),
- experiment: "sharing".into(),
+ experiment: "mobile".into(),
},
TelemetrySignal::ExperimentsOn {
- experiments: vec!["your_cloud".into(), "sharing".into()],
+ experiments: vec!["mobile".into()],
},
]
);
assert_eq!(
serde_json::to_value(&signals).unwrap(),
serde_json::json!([
- {"type": "experiment", "action": "experiment_on", "experiment": "sharing"},
- {"type": "experiments-on", "experiments": ["your_cloud", "sharing"]},
+ {"type": "experiment", "action": "experiment_on", "experiment": "mobile"},
+ {"type": "experiments-on", "experiments": ["mobile"]},
])
);
assert_eq!(
@@ -2231,10 +2231,10 @@ mod tests {
vec![
TelemetrySignal::Experiment {
action: "experiment_off".into(),
- experiment: "sharing".into(),
+ experiment: "mobile".into(),
},
TelemetrySignal::ExperimentsOn {
- experiments: vec!["your_cloud".into()]
+ experiments: vec![]
},
]
);
@@ -2244,9 +2244,6 @@ mod tests {
vec![TelemetrySignal::ExperimentsOn {
experiments: vec![
"cua_volume".into(),
- "your_cloud".into(),
- "sharing".into(),
- "web_ui".into(),
"secure_spaces".into(),
"child_spaces".into(),
"ask_first".into(),
@@ -2287,13 +2284,10 @@ mod tests {
.foreground()
.build();
t.acknowledge_notice();
- let off = Experiments {
- sharing: false,
- ..Default::default()
- };
+ let off = Experiments::default();
let on = Experiments {
cua_volume: true,
- sharing: true,
+ mobile: true,
..Default::default()
};
let signals = experiments_changed(&off, &on);
@@ -2318,18 +2312,14 @@ mod tests {
toggles,
[
("experiment_on".to_string(), "cua_volume".to_string()),
- ("experiment_on".to_string(), "sharing".to_string())
+ ("experiment_on".to_string(), "mobile".to_string())
]
);
let active = events
.iter()
.find(|e| e["event"] == "cua_app_active")
.expect("the day is active");
- // `your_cloud` is on by default, so the active day carries it too.
- assert_eq!(
- active["properties"]["experiments_on"],
- "cua_volume+your_cloud+sharing"
- );
+ assert_eq!(active["properties"]["experiments_on"], "cua_volume+mobile");
}
/// A `step_*` onboarding-page signal sends the first-run funnel events
diff --git a/libs/cua/crates/cua-spaces-app-core/src/wizard.rs b/libs/cua/crates/cua-spaces-app-core/src/wizard.rs
index b1a4834d57..b970a744bd 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/wizard.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/wizard.rs
@@ -1061,14 +1061,9 @@ pub fn ttl_text(ttl_hours: u32) -> String {
}
}
-/// The connected clouds the wizard offers: none while the "Your cloud"
-/// experiment is off (they stay connected; the wizard does not show them).
+/// The connected clouds the wizard offers: all of them.
pub fn offered_clouds(env: &WizardEnv) -> &[ConnectedCloud] {
- if env.experiments.your_cloud {
- &env.clouds
- } else {
- &[]
- }
+ &env.clouds
}
/// The connected cloud the wizard creates in: the chosen one, else the
@@ -1687,13 +1682,13 @@ pub struct WizardEnv {
#[serde(default)]
pub storage: Option<LocalStorage>,
/// The user's connected clouds (`cloud_status`), for "Your cloud"
- /// (offered only while its experiment is on: [`offered_clouds`]).
+ /// ([`offered_clouds`]).
#[serde(default)]
pub clouds: Vec<ConnectedCloud>,
/// The user's machines that provide Spaces (`Spaces.hosts()`).
#[serde(default)]
pub hosts: Vec<SpaceHost>,
- /// Settings, Experiments ("Your cloud" decides whether clouds show).
+ /// Settings, Experiments (the daemon-enforced switches the wizard reads).
#[serde(default)]
pub experiments: crate::experiments::Experiments,
/// The GPU option of each runtime that has one (the SDK's
@@ -3028,7 +3023,6 @@ fn field(id: &str, label: &str) -> WizardField {
/// The current step's fields, in order.
fn fields(
state: &WizardState,
- env: &WizardEnv,
image_error: Option<String>,
placement_error: Option<String>,
name_error: Option<String>,
@@ -3079,12 +3073,7 @@ fn fields(
},
]
.into_iter()
- // Connecting a cloud only with the "Your cloud" experiment.
- .chain(
- env.experiments
- .your_cloud
- .then(|| field("connect-cloud", CONNECT_CLOUD_LABEL)),
- )
+ .chain(std::iter::once(field("connect-cloud", CONNECT_CLOUD_LABEL)))
.collect(),
// The cloud picks the machine: no sliders, its facts only.
(WizardMode::Create, 1) if yours => vec![],
@@ -4163,7 +4152,6 @@ pub fn view_on(state: &WizardState, env: &WizardEnv, os: SpaceOs) -> WizardView
},
fields: fields(
state,
- env,
image_error,
placement_error_for_fields,
name_error,
@@ -4412,7 +4400,6 @@ mod tests {
fn with_cloud(e: &WizardEnv) -> WizardEnv {
WizardEnv {
clouds: vec![aws()],
- experiments: your_cloud_on(),
..e.clone()
}
}
@@ -4431,29 +4418,12 @@ mod tests {
storage: None,
clouds: vec![],
hosts: vec![],
- experiments: your_cloud_off(),
+ experiments: Default::default(),
gpus: None,
name_seed: Some(0x2a),
}
}
- /// The "Your cloud" experiment turned off (the tests' baseline; it is on
- /// by default).
- fn your_cloud_off() -> crate::experiments::Experiments {
- crate::experiments::Experiments {
- your_cloud: false,
- ..Default::default()
- }
- }
-
- /// The "Your cloud" experiment on.
- fn your_cloud_on() -> crate::experiments::Experiments {
- crate::experiments::Experiments {
- your_cloud: true,
- ..Default::default()
- }
- }
-
fn lume_gpu(supported: bool) -> GpuChoice {
GpuChoice {
runtime: "lume".into(),
@@ -5507,10 +5477,9 @@ mod tests {
}
#[test]
- fn a_linked_cloud_is_in_run_on_by_default() {
+ fn a_linked_cloud_is_in_run_on() {
let e = WizardEnv {
clouds: vec![aws()],
- experiments: Default::default(),
..env()
};
let v = view(&initial(&e), &e);
@@ -5519,15 +5488,6 @@ mod tests {
Some("aws [clouds] AWS \u{b7} us-west-2"),
"a fresh install lists the linked cloud"
);
- let off = WizardEnv {
- experiments: your_cloud_off(),
- ..e
- };
- assert!(
- !menu(&view(&initial(&off), &off))
- .iter()
- .any(|m| m.starts_with("aws "))
- );
}
#[test]
@@ -5541,18 +5501,8 @@ mod tests {
assert!(v.placements[0].selected && v.placements[0].enabled);
assert_eq!(v.placement_id, "local");
assert!(
- v.fields.iter().all(|f| f.id != "connect-cloud"),
- "Connect a cloud only with the experiment"
- );
- let with = WizardEnv {
- experiments: your_cloud_on(),
- ..e.clone()
- };
- assert!(
- view(&s, &with)
- .fields
- .iter()
- .any(|f| f.id == "connect-cloud")
+ v.fields.iter().any(|f| f.id == "connect-cloud"),
+ "Connect a cloud is always offered"
);
let picked = reduce(
&s,
@@ -5573,7 +5523,6 @@ mod tests {
fn a_connected_cloud_runs_what_it_offers_with_its_cost_and_lifetime() {
let e = WizardEnv {
clouds: vec![aws()],
- experiments: your_cloud_on(),
..env()
};
let s = initial(&e);
@@ -5669,7 +5618,6 @@ mod tests {
let e = WizardEnv {
default_location: Location::Yours,
clouds: vec![aws(), gcp],
- experiments: your_cloud_on(),
..env()
};
let s = initial(&e);
@@ -5960,11 +5908,11 @@ mod tests {
);
}
- /// The "Run on" menu lists This Mac and your machines; your clouds
- /// unless "Your cloud" was turned off (it is on by default). Disabled machines say why.
+ /// The "Run on" menu lists This Mac, your machines and your clouds.
+ /// Disabled machines say why.
#[test]
- fn the_run_on_menu_lists_every_machine_and_clouds_unless_the_experiment_is_off() {
- let mut e = WizardEnv {
+ fn the_run_on_menu_lists_every_machine_and_cloud() {
+ let e = WizardEnv {
hosts: hosts(),
clouds: vec![aws()],
..env()
@@ -5979,41 +5927,27 @@ mod tests {
"host:m-mini [hosts] Mac mini",
"host:lab [hosts] lab",
"host:m-studio [hosts] Studio (offline) (disabled)",
- ],
- "no cloud with the experiment off, though AWS is connected"
+ "aws [clouds] AWS \u{b7} us-west-2",
+ ]
);
let studio = &v.placements[4];
assert_eq!(studio.detail, "Studio is offline.");
assert_eq!(v.placements[0].detail, AUTO_PLACEMENT_DETAIL);
assert_eq!(v.placements[2].detail, "Through the Cua relay");
assert_eq!(v.placements[3].detail, "Over Tailscale or your network");
- // A cloud cannot be chosen while hidden, nor an offline machine.
- let s1 = reduce(&s, &WizardAction::ChoosePlacement { on: "aws".into() }, &e);
- assert_eq!(s1.placement, Location::Local);
+ // An offline machine cannot be chosen.
let s1 = reduce(
- &s1,
+ &s,
&WizardAction::ChoosePlacement {
on: "host:m-studio".into(),
},
&e,
);
assert_eq!(s1.placement, Location::Local);
- // With the experiment: the connected cloud, after the machines.
- e.experiments = your_cloud_on();
- let v = view(&s, &e);
- assert_eq!(
- menu(&v).last().map(String::as_str),
- Some("aws [clouds] AWS \u{b7} us-west-2")
- );
- assert_eq!(v.placements.len(), 6);
- // Off again while AWS is chosen: back on this Mac, AWS untouched.
+ // The connected cloud can.
let on_aws = reduce(&s, &WizardAction::ChoosePlacement { on: "aws".into() }, &e);
assert_eq!(view(&on_aws, &e).placement_id, "aws");
- e.experiments = your_cloud_off();
- let v = view(&on_aws, &e);
- assert_eq!(v.placement_id, "local");
- assert_eq!(create_args(&v.plan).on, "local");
- assert_eq!(e.clouds.len(), 1, "still connected");
+ assert_eq!(v.placements.len(), 6);
}
/// Auto ("the least-loaded of your machines") is offered only while you
@@ -6919,7 +6853,17 @@ mod tests {
let ids = |s: &WizardState| -> Vec<String> {
view(s, &e).fields.into_iter().map(|f| f.id).collect()
};
- assert_eq!(ids(&s), ["os", "image", "placement", "kind", "runtime"]);
+ assert_eq!(
+ ids(&s),
+ [
+ "os",
+ "image",
+ "placement",
+ "kind",
+ "runtime",
+ "connect-cloud"
+ ]
+ );
let s1 = reduce(&s, &WizardAction::Next, &e);
assert_eq!(
ids(&s1),
diff --git a/libs/cua/crates/cua-spaces-ffi/src/app_core.rs b/libs/cua/crates/cua-spaces-ffi/src/app_core.rs
index 4318382c0a..bbf21f8826 100644
--- a/libs/cua/crates/cua-spaces-ffi/src/app_core.rs
+++ b/libs/cua/crates/cua-spaces-ffi/src/app_core.rs
@@ -123,19 +123,7 @@ pub fn app_space_detail_live(
core::spaces::sidebar::detail_live(&space, usage.as_ref(), host_arch.as_deref())
}
-/// [`app_space_detail_live`] without what Settings, Experiments hides (the
-/// Share button while Sharing is off).
-#[uniffi::export]
-pub fn app_space_detail_with(
- space: AppSpace,
- usage: Option<AppSpaceUsage>,
- host_arch: Option<String>,
- experiments: AppExperiments,
-) -> AppSpaceDetail {
- core::spaces::sidebar::detail_with(&space, usage.as_ref(), host_arch.as_deref(), &experiments)
-}
-
-/// [`app_space_detail_with`] as this device sees it: `access` (from
+/// [`app_space_detail_live`] as this device sees it: `access` (from
/// [`app_machine_access_notice`]) greys out Connect on every Space reached
/// through the relay while this device is not enrolled; one of your
/// machines that does not share its desktop shows its note in place of the
@@ -145,14 +133,12 @@ pub fn app_space_detail_for(
space: AppSpace,
usage: Option<AppSpaceUsage>,
host_arch: Option<String>,
- experiments: AppExperiments,
access: Option<AppMachineAccessNotice>,
) -> AppSpaceDetail {
core::spaces::sidebar::detail_for(
&space,
usage.as_ref(),
host_arch.as_deref(),
- &experiments,
access.as_ref(),
)
}
@@ -2296,14 +2282,6 @@ mod experiment_sync_tests {
}
}
-/// The settings with the New UI as a launch of `version` shows it: the
-/// user's choice, else the default for the update channel and version
-/// (again after the channel changes).
-#[uniffi::export]
-pub fn app_settings_resolve_new_ui(settings: AppSettings, version: String) -> AppSettings {
- core::settings::resolve_new_ui(&settings, &version)
-}
-
/// The update channel of an install's first launch, from the file's
/// `channel`: Nightly for a prerelease, else unchanged.
#[uniffi::export]
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 2434733e24..1d76f34581 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
@@ -3598,11 +3598,11 @@ pub struct AppWizardEnv {
/// when known.
pub storage: Option<AppLocalStorage>,
/// The user's connected clouds (`cloud_status`), for "Your cloud"
- /// (offered only while its experiment is on: [`offered_clouds`]).
+ /// ([`offered_clouds`]).
pub clouds: Vec<AppConnectedCloud>,
/// The user's machines that provide Spaces (`Spaces.hosts()`).
pub hosts: Vec<AppSpaceHost>,
- /// Settings, Experiments ("Your cloud" decides whether clouds show).
+ /// Settings, Experiments (the daemon-enforced switches the wizard reads).
pub experiments: AppExperiments,
/// The GPU option of each runtime that has one (the SDK's
/// `gpu_support`), when known. A runtime not listed has none: the
@@ -6981,14 +6981,6 @@ pub type AppExperiments = core::experiments::Experiments;
pub struct AppExperiments {
/// Cua Volume in the first run and Settings, Storage.
pub cua_volume: bool,
- /// Your own clouds in the New Space wizard.
- pub your_cloud: bool,
- /// Sharing a Space with other accounts. On unless turned off: a missing
- /// key reads as on (the plans on cua.ai/pricing list sharing).
- pub sharing: bool,
- /// The shared web UI is the main window. Always on in the macOS shell
- /// ([`crate::settings::resolve_new_ui`]); kept for older files and builds.
- pub web_ui: bool,
/// Secure Spaces: a Space reaches the internet and nothing else on the
/// network unless it is opened. Off unless turned on; the daemon enforces
/// it (the switch is kept in the cua home).
@@ -7144,15 +7136,8 @@ pub struct AppSettings {
/// Settings); `None`: never chosen ([`crate::login_item::launch_plan`]).
pub launch_at_login: Option<bool>,
/// Settings, Experiments: every switch off unless turned on
- /// ([`crate::experiments`]). Its `webUi` is always on in the macOS
- /// shell ([`resolve_new_ui`]); the file keeps only [`Self::new_ui`]'s
- /// "on" there, the value older builds read.
+ /// ([`crate::experiments`]).
pub experiments: AppExperiments,
- /// The New UI as an older build's "Use classic UI" saved it. Read and
- /// kept for those builds, never acted on: the web UI is the only UI
- /// ([`resolve_new_ui`]). An older build's saved `webUi: true` reads as
- /// `Some(true)`; its `false` was only the saved default ([`load`]).
- pub new_ui: Option<bool>,
/// Keyvault copies (import ids) the user dismissed from the notch: it no
/// longer shows them, nothing is revoked or wiped
/// ([`crate::keyvault::view::prune_dismissed`] forgets the gone ones).
@@ -10352,7 +10337,7 @@ pub enum AppTelemetrySignal {
Experiment {
/// `experiment_on` or `experiment_off`.
action: String,
- /// `cua_volume`, `your_cloud` or `sharing`.
+ /// `cua_volume`, `mobile`, ...
experiment: String,
},
/// Which experiments are on now (no event of its own: the daily
diff --git a/libs/cua/crates/cua-telemetry/src/schema.rs b/libs/cua/crates/cua-telemetry/src/schema.rs
index 8d7321e614..40614724e8 100644
--- a/libs/cua/crates/cua-telemetry/src/schema.rs
+++ b/libs/cua/crates/cua-telemetry/src/schema.rs
@@ -715,8 +715,6 @@ pub const PLANS: &[&str] = &["free", "pro", "teams", "unknown"];
/// `cua-spaces-app-core` `experiments::Experiment::id`).
pub const EXPERIMENTS: &[&str] = &[
"cua_volume",
- "your_cloud",
- "sharing",
"secure_spaces",
"child_spaces",
"ask_first",
@@ -1822,7 +1820,7 @@ pub const EVENTS: &[EventSpec] = &[
p(
"experiments_on",
Kind::Set(EXPERIMENTS),
- "The Spaces app's experiments turned on in Settings, Experiments on this install (cua_volume, your_cloud, sharing, secure_spaces, child_spaces, ask_first, ci_runners, tcp_shares, mobile, warm_pools, joined with +), or none.",
+ "The Spaces app's experiments turned on in Settings, Experiments on this install (cua_volume, secure_spaces, child_spaces, ask_first, ci_runners, tcp_shares, mobile, warm_pools, joined with +), or none.",
),
p(
"ui_locale",
@@ -2257,7 +2255,7 @@ pub const EVENTS: &[EventSpec] = &[
p(
"experiment",
Kind::Enum(EXPERIMENTS),
- "Which experiment: cua_volume, your_cloud, sharing, secure_spaces, child_spaces, ask_first, ci_runners, tcp_shares, mobile or warm_pools.",
+ "Which experiment: cua_volume, secure_spaces, child_spaces, ask_first, ci_runners, tcp_shares, mobile or warm_pools.",
),
],
purpose: "Which experiments people try, and which they turn off again.",
diff --git a/libs/cua/crates/cua-telemetry/tests/privacy.rs b/libs/cua/crates/cua-telemetry/tests/privacy.rs
index 6f97658eaf..e326c69acb 100644
--- a/libs/cua/crates/cua-telemetry/tests/privacy.rs
+++ b/libs/cua/crates/cua-telemetry/tests/privacy.rs
@@ -140,7 +140,7 @@ fn all_builders(s: &str) -> Vec<Event> {
events::stream_summary(s, s, Some(true), 900, 1080, Some(40.0), d).unwrap(),
events::app_active(),
// Unknown experiment ids are dropped (`none`); known ones kept.
- events::app_active_with(&[s, "sharing", s], s),
+ events::app_active_with(&[s, "mobile", s], s),
events::space_create(
&events::SpaceCreate {
on: s,
@@ -212,7 +212,7 @@ fn all_builders(s: &str) -> Vec<Event> {
events::app_update(s, s, s),
events::device_enroll(s, Outcome::Ok),
events::cloud_link(s, "aws", "oidc", "connected", Outcome::Ok),
- events::experiment(s, "sharing"),
+ events::experiment(s, "mobile"),
events::experiment("experiment_on", s),
] {
assert!(opt.is_none(), "PII accepted as a vocabulary value: {s}");
@@ -274,7 +274,7 @@ fn all_builders(s: &str) -> Vec<Event> {
)
.unwrap(),
);
- v.push(events::experiment("experiment_off", "your_cloud").unwrap());
+ v.push(events::experiment("experiment_off", "warm_pools").unwrap());
v.push(events::installer_step("installer_started", s, s, s, &[s]).unwrap());
v.push(events::installer_step("installer_failed", s, s, "ps1", &[s, "cli"]).unwrap());
v.push(
@@ -1631,33 +1631,33 @@ fn the_active_day_carries_the_experiments_that_are_on() {
let k = Kind::Set(schema::EXPERIMENTS);
for ok in [
"none",
- "sharing",
- "cua_volume+sharing",
- "cua_volume+your_cloud+sharing",
+ "mobile",
+ "cua_volume+mobile",
+ "cua_volume+mobile+warm_pools",
] {
assert!(schema::value_ok(k, &Value::from(ok)), "{ok}");
}
for bad in [
"",
- "sharing+cua_volume",
- "sharing+sharing",
+ "mobile+cua_volume",
+ "mobile+mobile",
"cua_volume+",
- "+sharing",
- "none+sharing",
+ "+mobile",
+ "none+mobile",
"/Users/alice",
] {
assert!(!schema::value_ok(k, &Value::from(bad)), "{bad}");
}
assert_eq!(
- events::experiments_set(&["sharing", "nope", "cua_volume", "sharing"]),
- "cua_volume+sharing"
+ events::experiments_set(&["mobile", "nope", "cua_volume", "mobile"]),
+ "cua_volume+mobile"
);
assert_eq!(events::experiments_set(&[]), "none");
let h = tempfile::tempdir().unwrap();
let (t, sink) = ready(h.path(), &[]);
assert_eq!(t.capture_active_on(20_000), Captured::Queued);
- t.set_experiments_on(&["your_cloud", "[email protected]"]);
+ t.set_experiments_on(&["warm_pools", "[email protected]"]);
// The next day, another process of the same install.
let (t2, sink2) = ready(h.path(), &[]);
assert_eq!(t2.capture_active_on(20_001), Captured::Queued);
@@ -1676,10 +1676,10 @@ fn the_active_day_carries_the_experiments_that_are_on() {
.collect()
};
assert_eq!(sets(&sink), ["none"], "the first day had none");
- assert_eq!(sets(&sink2), ["your_cloud"]);
+ assert_eq!(sets(&sink2), ["warm_pools"]);
let h2 = tempfile::tempdir().unwrap();
let (off, _) = ready(h2.path(), &[("DO_NOT_TRACK", "1")]);
- off.set_experiments_on(&["sharing"]);
+ off.set_experiments_on(&["mobile"]);
assert!(!h2.path().join("telemetry/experiments_on").exists());
}
diff --git a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
index e0756d688f..7dd79b582a 100644
--- a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
+++ b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
@@ -17092,20 +17092,6 @@ public struct AppExperiments: Equatable, Hashable {
* Cua Volume in the first run and Settings, Storage.
*/
public var cuaVolume: Bool
- /**
- * Your own clouds in the New Space wizard.
- */
- public var yourCloud: Bool
- /**
- * Sharing a Space with other accounts. On unless turned off: a missing
- * key reads as on (the plans on cua.ai/pricing list sharing).
- */
- public var sharing: Bool
- /**
- * The shared web UI is the main window. Always on in the macOS shell
- * ([`crate::settings::resolve_new_ui`]); kept for older files and builds.
- */
- public var webUi: Bool
/**
* Secure Spaces: a Space reaches the internet and nothing else on the
* network unless it is opened. Off unless turned on; the daemon enforces
@@ -17154,17 +17140,6 @@ public struct AppExperiments: Equatable, Hashable {
/**
* Cua Volume in the first run and Settings, Storage.
*/cuaVolume: Bool,
- /**
- * Your own clouds in the New Space wizard.
- */yourCloud: Bool,
- /**
- * Sharing a Space with other accounts. On unless turned off: a missing
- * key reads as on (the plans on cua.ai/pricing list sharing).
- */sharing: Bool,
- /**
- * The shared web UI is the main window. Always on in the macOS shell
- * ([`crate::settings::resolve_new_ui`]); kept for older files and builds.
- */webUi: Bool,
/**
* Secure Spaces: a Space reaches the internet and nothing else on the
* network unless it is opened. Off unless turned on; the daemon enforces
@@ -17200,9 +17175,6 @@ public struct AppExperiments: Equatable, Hashable {
* turned on; the daemon enforces it (the switch is kept in the cua home).
*/warmPools: Bool) {
self.cuaVolume = cuaVolume
- self.yourCloud = yourCloud
- self.sharing = sharing
- self.webUi = webUi
self.secureSpaces = secureSpaces
self.childSpaces = childSpaces
self.askFirst = askFirst
@@ -17229,9 +17201,6 @@ public struct FfiConverterTypeAppExperiments: FfiConverterRustBuffer {
return
try AppExperiments(
cuaVolume: FfiConverterBool.read(from: &buf),
- yourCloud: FfiConverterBool.read(from: &buf),
- sharing: FfiConverterBool.read(from: &buf),
- webUi: FfiConverterBool.read(from: &buf),
secureSpaces: FfiConverterBool.read(from: &buf),
childSpaces: FfiConverterBool.read(from: &buf),
askFirst: FfiConverterBool.read(from: &buf),
@@ -17244,9 +17213,6 @@ public struct FfiConverterTypeAppExperiments: FfiConverterRustBuffer {
public static func write(_ value: AppExperiments, into buf: inout [UInt8]) {
FfiConverterBool.write(value.cuaVolume, into: &buf)
- FfiConverterBool.write(value.yourCloud, into: &buf)
- FfiConverterBool.write(value.sharing, into: &buf)
- FfiConverterBool.write(value.webUi, into: &buf)
FfiConverterBool.write(value.secureSpaces, into: &buf)
FfiConverterBool.write(value.childSpaces, into: &buf)
FfiConverterBool.write(value.askFirst, into: &buf)
@@ -35865,18 +35831,9 @@ public struct AppSettings: Equatable, Hashable {
public var launchAtLogin: Bool?
/**
* Settings, Experiments: every switch off unless turned on
- * ([`crate::experiments`]). Its `webUi` is always on in the macOS
- * shell ([`resolve_new_ui`]); the file keeps only [`Self::new_ui`]'s
- * "on" there, the value older builds read.
+ * ([`crate::experiments`]).
*/
public var experiments: AppExperiments
- /**
- * The New UI as an older build's "Use classic UI" saved it. Read and
- * kept for those builds, never acted on: the web UI is the only UI
- * ([`resolve_new_ui`]). An older build's saved `webUi: true` reads as
- * `Some(true)`; its `false` was only the saved default ([`load`]).
- */
- public var newUi: Bool?
/**
* Keyvault copies (import ids) the user dismissed from the notch: it no
* longer shows them, nothing is revoked or wiped
@@ -35974,16 +35931,8 @@ public struct AppSettings: Equatable, Hashable {
*/launchAtLogin: Bool?,
/**
* Settings, Experiments: every switch off unless turned on
- * ([`crate::experiments`]). Its `webUi` is always on in the macOS
- * shell ([`resolve_new_ui`]); the file keeps only [`Self::new_ui`]'s
- * "on" there, the value older builds read.
+ * ([`crate::experiments`]).
*/experiments: AppExperiments,
- /**
- * The New UI as an older build's "Use classic UI" saved it. Read and
- * kept for those builds, never acted on: the web UI is the only UI
- * ([`resolve_new_ui`]). An older build's saved `webUi: true` reads as
- * `Some(true)`; its `false` was only the saved default ([`load`]).
- */newUi: Bool?,
/**
* Keyvault copies (import ids) the user dismissed from the notch: it no
* longer shows them, nothing is revoked or wiped
@@ -36043,7 +35992,6 @@ public struct AppSettings: Equatable, Hashable {
self.updateChannel = updateChannel
self.launchAtLogin = launchAtLogin
self.experiments = experiments
- self.newUi = newUi
self.dismissedAccess = dismissedAccess
self.notchPinned = notchPinned
self.keyvaultSiteIcons = keyvaultSiteIcons
@@ -36082,7 +36030,6 @@ public struct FfiConverterTypeAppSettings: FfiConverterRustBuffer {
updateChannel: FfiConverterTypeAppUpdateChannel.read(from: &buf),
launchAtLogin: FfiConverterOptionBool.read(from: &buf),
experiments: FfiConverterTypeAppExperiments.read(from: &buf),
- newUi: FfiConverterOptionBool.read(from: &buf),
dismissedAccess: FfiConverterSequenceString.read(from: &buf),
notchPinned: FfiConverterSequenceString.read(from: &buf),
keyvaultSiteIcons: FfiConverterBool.read(from: &buf),
@@ -36107,7 +36054,6 @@ public struct FfiConverterTypeAppSettings: FfiConverterRustBuffer {
FfiConverterTypeAppUpdateChannel.write(value.updateChannel, into: &buf)
FfiConverterOptionBool.write(value.launchAtLogin, into: &buf)
FfiConverterTypeAppExperiments.write(value.experiments, into: &buf)
- FfiConverterOptionBool.write(value.newUi, into: &buf)
FfiConverterSequenceString.write(value.dismissedAccess, into: &buf)
FfiConverterSequenceString.write(value.notchPinned, into: &buf)
FfiConverterBool.write(value.keyvaultSiteIcons, into: &buf)
@@ -44621,7 +44567,7 @@ public struct AppWizardEnv: Equatable, Hashable {
public var storage: AppLocalStorage?
/**
* The user's connected clouds (`cloud_status`), for "Your cloud"
- * (offered only while its experiment is on: [`offered_clouds`]).
+ * ([`offered_clouds`]).
*/
public var clouds: [AppConnectedCloud]
/**
@@ -44629,7 +44575,7 @@ public struct AppWizardEnv: Equatable, Hashable {
*/
public var hosts: [AppSpaceHost]
/**
- * Settings, Experiments ("Your cloud" decides whether clouds show).
+ * Settings, Experiments (the daemon-enforced switches the wizard reads).
*/
public var experiments: AppExperiments
/**
@@ -44685,13 +44631,13 @@ public struct AppWizardEnv: Equatable, Hashable {
*/storage: AppLocalStorage?,
/**
* The user's connected clouds (`cloud_status`), for "Your cloud"
- * (offered only while its experiment is on: [`offered_clouds`]).
+ * ([`offered_clouds`]).
*/clouds: [AppConnectedCloud],
/**
* The user's machines that provide Spaces (`Spaces.hosts()`).
*/hosts: [AppSpaceHost],
/**
- * Settings, Experiments ("Your cloud" decides whether clouds show).
+ * Settings, Experiments (the daemon-enforced switches the wizard reads).
*/experiments: AppExperiments,
/**
* The GPU option of each runtime that has one (the SDK's
@@ -65580,7 +65526,7 @@ public enum AppTelemetrySignal: Equatable, Hashable {
* `experiment_on` or `experiment_off`.
*/action: String,
/**
- * `cua_volume`, `your_cloud` or `sharing`.
+ * `cua_volume`, `mobile`, ...
*/experiment: String
)
/**
@@ -80925,19 +80871,6 @@ public func appSettingsPage(input: AppSettingsInput) -> AppSettingsPage {
)
})
}
-/**
- * The settings with the New UI as a launch of `version` shows it: the
- * user's choice, else the default for the update channel and version
- * (again after the channel changes).
- */
-public func appSettingsResolveNewUi(settings: AppSettings, version: String) -> AppSettings {
- return try! FfiConverterTypeAppSettings_lift(try! rustCall() {
- uniffi_cua_spaces_ffi_fn_func_app_settings_resolve_new_ui(
- FfiConverterTypeAppSettings_lower(settings),
- FfiConverterString.lower(version),$0
- )
-})
-}
/**
* Writes the settings file, and keeps the experiments the daemon enforces
* where it reads them (the cua home).
@@ -81153,19 +81086,18 @@ public func appSpaceDetailCopy() -> AppDetailCopy {
})
}
/**
- * [`app_space_detail_with`] as this device sees it: `access` (from
+ * [`app_space_detail_live`] as this device sees it: `access` (from
* [`app_machine_access_notice`]) greys out Connect on every Space reached
* through the relay while this device is not enrolled; one of your
* machines that does not share its desktop shows its note in place of the
* desktop, Stream, Agents and Teleport.
*/
-public func appSpaceDetailFor(space: AppSpace, usage: AppSpaceUsage?, hostArch: String?, experiments: AppExperiments, access: AppMachineAccessNotice?) -> AppSpaceDetail {
+public func appSpaceDetailFor(space: AppSpace, usage: AppSpaceUsage?, hostArch: String?, access: AppMachineAccessNotice?) -> AppSpaceDetail {
return try! FfiConverterTypeAppSpaceDetail_lift(try! rustCall() {
uniffi_cua_spaces_ffi_fn_func_app_space_detail_for(
FfiConverterTypeAppSpace_lower(space),
FfiConverterOptionTypeAppSpaceUsage.lower(usage),
FfiConverterOptionString.lower(hostArch),
- FfiConverterTypeAppExperiments_lower(experiments),
FfiConverterOptionTypeAppMachineAccessNotice.lower(access),$0
)
})
@@ -81185,20 +81117,6 @@ public func appSpaceDetailLive(space: AppSpace, usage: AppSpaceUsage?, hostArch:
)
})
}
-/**
- * [`app_space_detail_live`] without what Settings, Experiments hides (the
- * Share button while Sharing is off).
- */
-public func appSpaceDetailWith(space: AppSpace, usage: AppSpaceUsage?, hostArch: String?, experiments: AppExperiments) -> AppSpaceDetail {
- return try! FfiConverterTypeAppSpaceDetail_lift(try! rustCall() {
- uniffi_cua_spaces_ffi_fn_func_app_space_detail_with(
- FfiConverterTypeAppSpace_lower(space),
- FfiConverterOptionTypeAppSpaceUsage.lower(usage),
- FfiConverterOptionString.lower(hostArch),
- FfiConverterTypeAppExperiments_lower(experiments),$0
- )
-})
-}
/**
* One of your machines that provides Spaces (the SDK's `Spaces.hosts()`)
* as the wizard reads it.
@@ -83034,9 +82952,6 @@ private let initializationResult: InitializationResult = {
if (uniffi_cua_spaces_ffi_checksum_func_app_settings_page() != 454) {
return InitializationResult.apiChecksumMismatch
}
- if (uniffi_cua_spaces_ffi_checksum_func_app_settings_resolve_new_ui() != 48081) {
- return InitializationResult.apiChecksumMismatch
- }
if (uniffi_cua_spaces_ffi_checksum_func_app_settings_save() != 62204) {
return InitializationResult.apiChecksumMismatch
}
@@ -83094,15 +83009,12 @@ private let initializationResult: InitializationResult = {
if (uniffi_cua_spaces_ffi_checksum_func_app_space_detail_copy() != 55740) {
return InitializationResult.apiChecksumMismatch
}
- if (uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for() != 46982) {
+ if (uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for() != 50402) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_cua_spaces_ffi_checksum_func_app_space_detail_live() != 55583) {
return InitializationResult.apiChecksumMismatch
}
- if (uniffi_cua_spaces_ffi_checksum_func_app_space_detail_with() != 51134) {
- return InitializationResult.apiChecksumMismatch
- }
if (uniffi_cua_spaces_ffi_checksum_func_app_space_host() != 37974) {
return InitializationResult.apiChecksumMismatch
}
diff --git a/libs/spaces-app-swift/Sources/cua_spaces_ffiFFI/include/cua_spaces_ffiFFI.h b/libs/spaces-app-swift/Sources/cua_spaces_ffiFFI/include/cua_spaces_ffiFFI.h
index ca6b35a9c6..fe93716010 100644
--- a/libs/spaces-app-swift/Sources/cua_spaces_ffiFFI/include/cua_spaces_ffiFFI.h
+++ b/libs/spaces-app-swift/Sources/cua_spaces_ffiFFI/include/cua_spaces_ffiFFI.h
@@ -1773,11 +1773,6 @@ RustBuffer uniffi_cua_spaces_ffi_fn_func_app_settings_load(RustBuffer path, Rust
RustBuffer uniffi_cua_spaces_ffi_fn_func_app_settings_page(RustBuffer input, RustCallStatus *_Nonnull out_status
);
#endif
-#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SETTINGS_RESOLVE_NEW_UI
-#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SETTINGS_RESOLVE_NEW_UI
-RustBuffer uniffi_cua_spaces_ffi_fn_func_app_settings_resolve_new_ui(RustBuffer settings, RustBuffer version, RustCallStatus *_Nonnull out_status
-);
-#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SETTINGS_SAVE
#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SETTINGS_SAVE
void uniffi_cua_spaces_ffi_fn_func_app_settings_save(RustBuffer path, RustBuffer settings, RustCallStatus *_Nonnull out_status
@@ -1877,7 +1872,7 @@ RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_detail_copy(RustCallStatus *_
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_DETAIL_FOR
#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_DETAIL_FOR
-RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_detail_for(RustBuffer space, RustBuffer usage, RustBuffer host_arch, RustBuffer experiments, RustBuffer access, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_detail_for(RustBuffer space, RustBuffer usage, RustBuffer host_arch, RustBuffer access, RustCallStatus *_Nonnull out_status
);
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_DETAIL_LIVE
@@ -1885,11 +1880,6 @@ RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_detail_for(RustBuffer space,
RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_detail_live(RustBuffer space, RustBuffer usage, RustBuffer host_arch, RustCallStatus *_Nonnull out_status
);
#endif
-#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_DETAIL_WITH
-#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_DETAIL_WITH
-RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_detail_with(RustBuffer space, RustBuffer usage, RustBuffer host_arch, RustBuffer experiments, RustCallStatus *_Nonnull out_status
-);
-#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_HOST
#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_FN_FUNC_APP_SPACE_HOST
RustBuffer uniffi_cua_spaces_ffi_fn_func_app_space_host(RustBuffer host, RustCallStatus *_Nonnull out_status
@@ -3977,12 +3967,6 @@ uint16_t uniffi_cua_spaces_ffi_checksum_func_app_settings_load(void
#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SETTINGS_PAGE
uint16_t uniffi_cua_spaces_ffi_checksum_func_app_settings_page(void
-);
-#endif
-#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SETTINGS_RESOLVE_NEW_UI
-#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SETTINGS_RESOLVE_NEW_UI
-uint16_t uniffi_cua_spaces_ffi_checksum_func_app_settings_resolve_new_ui(void
-
);
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SETTINGS_SAVE
@@ -4109,12 +4093,6 @@ uint16_t uniffi_cua_spaces_ffi_checksum_func_app_space_detail_for(void
#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SPACE_DETAIL_LIVE
uint16_t uniffi_cua_spaces_ffi_checksum_func_app_space_detail_live(void
-);
-#endif
-#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SPACE_DETAIL_WITH
-#define UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SPACE_DETAIL_WITH
-uint16_t uniffi_cua_spaces_ffi_checksum_func_app_space_detail_with(void
-
);
#endif
#ifndef UNIFFI_FFIDEF_UNIFFI_CUA_SPACES_FFI_CHECKSUM_FUNC_APP_SPACE_HOST