Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.
Rust agentai-agentapplecomputer-usecomputer-use-agentcontainerizationcuadesktop-automationhacktoberfestlumemacosmanusoperatorswiftvirtualizationvirtualization-frameworkwindowswindows-sandbox
Fleets removal batch 8: remove the retired Cua Cloud model from Spaces app-core and clients (#5764)
Francesco Bonacciffccd170a742
diff --git a/apps/cua-spaces-desktop/src/bridge/settings.ts b/apps/cua-spaces-desktop/src/bridge/settings.tsindex cda93acca2..f93fd87293 100644--- a/apps/cua-spaces-desktop/src/bridge/settings.ts+++ b/apps/cua-spaces-desktop/src/bridge/settings.ts@@ -39,16 +39,12 @@ export function settingsPage(model: AppModel, parts: HostParts) {signIn: model.signIn,canSignOut: model.account !== null && model.identity !== null,menuBar: model.settings.menuBar,- defaultLocation: model.settings.defaultLocation,- locationLockedBy: undefined,telemetry: telemetryInput(model),agents: coding.rows ?? undefined,agentsBusy: coding.busy,agentsPending: coding.pending,// Teams from the Spaces API (read by `settings.get`).teams: model.teams.input(),- // No Cua Cloud billing in the apps (the row stays hidden).- billing: undefined,loginItem:login.status === null? undefined@@ -149,9 +145,6 @@ export function settingsMethods(ctx: BridgeContext): Handlers {model.linuxSource = (await model.backend.linuxSource()) ?? option;model.changed("settings");return;- case "default-location":- save({ defaultLocation: model.native.AppLocation.Local }); // Cua Cloud has ended- return;case "auto-connect":save({ autoConnect: option === "on" });return;diff --git a/apps/cua-spaces-desktop/src/bridge/spaces.ts b/apps/cua-spaces-desktop/src/bridge/spaces.tsindex b973c2260d..0a09701b90 100644--- a/apps/cua-spaces-desktop/src/bridge/spaces.ts+++ b/apps/cua-spaces-desktop/src/bridge/spaces.ts@@ -54,7 +54,6 @@ export function createOptions(env: AppWizardEnv, macosVmsRunning: number | null,storage: encode(env.storage),},gpus: encode(env.gpus),- cloudPricing: encode(env.cloudPricing),experiments: encode(env.experiments),maxCpus: env.maxCpus,env: encode(env),@@ -71,7 +70,7 @@ export function createArgs(native: Native, c: BridgeArgs, defaultOn: string): Apconst kind = kindOf(native, typeof c.kind === "string" ? c.kind : "");if (!kind) throw Failure.badArgs("config.kind: container | vm");const runtime = runtimeOf(native, typeof c.runtime === "string" ? c.runtime : "auto");- if (!runtime) throw Failure.badArgs("config.runtime: auto | gvisor | runc | qemu | lume | kubevirt | an external runtime's name");+ if (!runtime) throw Failure.badArgs("config.runtime: auto | gvisor | runc | qemu | lume | an external runtime's name");const count = (k: string) => (typeof c[k] === "number" && Number.isFinite(c[k]) && (c[k] as number) >= 0 ? Math.floor(c[k] as number) : undefined);const text = (k: string) => (typeof c[k] === "string" && c[k] !== "" ? (c[k] as string) : undefined);return {diff --git a/apps/cua-spaces-desktop/src/model/app-model.ts b/apps/cua-spaces-desktop/src/model/app-model.tsindex 72fc2e3078..66c00c0a60 100644--- a/apps/cua-spaces-desktop/src/model/app-model.ts+++ b/apps/cua-spaces-desktop/src/model/app-model.ts@@ -15,7 +15,6 @@ import type {AppCreatesState,AppCreateSpaceArgs,AppGpuChoice,- AppCloudPricing,AppLocalStorage,AppMachinePageRow,AppMachinesPageInput,@@ -148,7 +147,7 @@ export class AppModel {bannerIsError = false;/** The signed-in account. */identity: string | null;- /** Cua Cloud can be used. */+ /** A Cua account is signed in (or client credentials are set). */cloudConfigured = false;signIn: AppSignInPhase;/** The page a waiting sign-in finishes on. */@@ -558,7 +557,7 @@ export class AppModel {}});const cloudRead = this.backend- .cloudAvailable()+ .loggedIn().catch(() => false).then((cloud) => {if (cloud !== this.cloudConfigured) {@@ -635,13 +634,11 @@ export class AppModel {/** What New Space knows, freshly probed; every probe runs at once and each is bounded. */async newSpaceEnv(): Promise<AppWizardEnv> {const b = this.backend;- const [runtimes, storage, pricing, gpus, hosts, cloud, lume, linux, vms] = await Promise.all([+ const [runtimes, storage, gpus, hosts, lume, linux, vms] = await Promise.all([b.localRuntimes(),b.localStorage(),- b.cloudPricing(),b.gpuChoices(),b.hosts(),- b.cloudAvailable(),b.lumeSource(),b.linuxSource(),b.runningMacosVms(),@@ -653,7 +650,7 @@ export class AppModel {// Lume did not answer this time: keep what it said last.this.runningMacosVms = vms ?? this.runningMacosVms;await this.readRuntimeAdvice(runtimes);- return this.wizardEnv(cloud, runtimes, storage, pricing, gpus);+ return this.wizardEnv(runtimes, storage, gpus);}/** Windows: what is missing for local Spaces and what the app can do about it. */@@ -687,20 +684,13 @@ export class AppModel {/** What New Space knows without asking anything: the env while the live services are still starting. */knownNewSpaceEnv(): AppWizardEnv {- return this.wizardEnv(false, null, null, null, null);+ return this.wizardEnv(null, null, null);}- private wizardEnv(- available: boolean,- runtimes: LocalRuntimes | null,- storage: LocalStorage | null,- pricing: AppCloudPricing | null,- gpus: AppGpuChoice[] | null,- ): AppWizardEnv {+ private wizardEnv(runtimes: LocalRuntimes | null, storage: LocalStorage | null, gpus: AppGpuChoice[] | null): AppWizardEnv {const backends = runtimes?.ready;const env: AppWizardEnv = {defaultLocation: this.settings.defaultLocation,- cloudAvailable: available,localAvailable: backends ? backends.length > 0 : true,localReason:backends && backends.length === 0@@ -713,7 +703,6 @@ export class AppModel {lumeSource: this.lumeSource ?? undefined,linuxSource: this.linuxSource ?? undefined,storage: storage ? wizardStorage(storage) : undefined,- cloudPricing: available ? (pricing ?? undefined) : undefined,clouds: this.cloud.clouds,hosts: this.hosts,experiments: this.settings.experiments,@@ -765,7 +754,7 @@ export class AppModel {// on vmnet): ask now, while the person who pressed Create is here.if (args.on === "local") this.host.requestLocalNetwork();const machine = args.on.startsWith("host:") ? args.on.slice("host:".length) : undefined;- const provider = args.on === "cloud" ? this.native.AppSpaceProvider.Cloud : args.on === "local" ? this.native.AppSpaceProvider.Local : this.native.AppSpaceProvider.Relay;+ const provider = args.on === "local" ? this.native.AppSpaceProvider.Local : this.native.AppSpaceProvider.Relay;this.sendCreate(new this.native.AppCreateAction.Start({id: pendingId,diff --git a/apps/cua-spaces-desktop/src/model/backend.ts b/apps/cua-spaces-desktop/src/model/backend.tsindex 581bce3393..b5888958f3 100644--- a/apps/cua-spaces-desktop/src/model/backend.ts+++ b/apps/cua-spaces-desktop/src/model/backend.ts@@ -7,7 +7,6 @@// data. Bounded where the app waits on it.import type { Native } from "../native/load";import type {- AppCloudPricing,AppCreateSpaceArgs,AppGpuChoice,AppRuntime,@@ -114,9 +113,9 @@ export interface SpacesBackend {linuxSource(): Promise<string | null>;setLinuxSource(value: string): Promise<void>;localStorage(): Promise<LocalStorage | null>;- cloudAvailable(): Promise<boolean>;+ /** A Cua account is signed in (or client credentials are set). */+ loggedIn(): Promise<boolean>;runningMacosVms(): Promise<number | null>;- cloudPricing(): Promise<AppCloudPricing | null>;usage(id: string): Promise<AppSpaceUsage | null>;/** The Space's coding-agent runs as rows (the core's mapping of the runs, attention first). */agentRuns(id: string): Promise<AppSpaceAgentRun[]>;@@ -225,7 +224,7 @@ export function kindOf(native: Native, word: string): AppSpaceKind | undefined {}/** The engines built into the SDK, by the word a create passes. */-const BUILT_IN_RUNTIMES = ["auto", "gvisor", "runc", "qemu", "lume", "kubevirt"] as const;+const BUILT_IN_RUNTIMES = ["auto", "gvisor", "runc", "qemu", "lume"] as const;/** A runtime word the app core accepts (its `valid_runtime_word`): a built-in engine or an external provider's name. */export function isRuntimeWord(word: string): boolean {@@ -246,8 +245,6 @@ export function runtimeOf(native: Native, word: string): AppRuntime | undefinedreturn new native.AppRuntime.Qemu();case "lume":return new native.AppRuntime.Lume();- case "kubevirt":- return new native.AppRuntime.Kubevirt();default:return new native.AppRuntime.Other(word);}@@ -505,7 +502,7 @@ export class LiveSpacesBackend implements SpacesBackend {return bounded(PROBE_SECONDS, () => this.cua.local().storage());}- async cloudAvailable(): Promise<boolean> {+ async loggedIn(): Promise<boolean> {return (await bounded(PROBE_SECONDS, () => this.cua.auth().status().loggedIn)) ?? false;}@@ -520,14 +517,6 @@ export class LiveSpacesBackend implements SpacesBackend {return runningMacosVms(answer);}- /**- * No estimate: the rates came from the Cua Cloud API, which has ended, and- * the app does not offer new cloud Spaces. New Space never waits on it.- */- async cloudPricing(): Promise<AppCloudPricing | null> {- return null;- }-async usage(id: string): Promise<AppSpaceUsage | null> {const u = await bounded(5, async () => (await this.cua.spaces().space(id)).usage());return u ? { cpuCount: u.cpuCount, cpuPercent: u.cpuPercent, loadAverage1m: u.loadAverage1m, memoryUsed: u.memoryUsed, memoryTotal: u.memoryTotal, memoryLimited: u.memoryLimited, diskUsed: u.diskUsed, diskTotal: u.diskTotal, diskLimited: u.diskLimited } : null;diff --git a/apps/cua-spaces-desktop/src/model/pending.ts b/apps/cua-spaces-desktop/src/model/pending.tsindex 18b96ed8a4..b930d1075f 100644--- a/apps/cua-spaces-desktop/src/model/pending.ts+++ b/apps/cua-spaces-desktop/src/model/pending.ts@@ -112,9 +112,8 @@ export class PendingSpacesBackend implements SpacesBackend {linuxSource = async () => (await this.b()).linuxSource();setLinuxSource = async (value: string) => (await this.b()).setLinuxSource(value);localStorage = async () => (await this.b()).localStorage();- cloudAvailable = async () => (await this.b()).cloudAvailable();+ loggedIn = async () => (await this.b()).loggedIn();runningMacosVms = async () => (await this.b()).runningMacosVms();- cloudPricing = async () => (await this.b()).cloudPricing();usage = async (id: string) => (await this.b()).usage(id);agentRuns = async (id: string) => (await this.b()).agentRuns(id);windows = async (id: string) => (await this.b()).windows(id);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.tsindex 09f99925b4..8a69faad7e 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@@ -10488,160 +10488,6 @@ const FfiConverterTypeAppAuditInput = (() => {return new FFIConverter();})();-export type AppBillingCard = {- /**- * `visa`, `mastercard`, ...- */- brand: string,- /**- * Last four digits.- */- last4: string-}--/**- * Generated factory for {@link AppBillingCard} record objects.- */-export const AppBillingCard = (() => {- const defaults = () => ({- });- const create = (() => {- return uniffiCreateRecord<AppBillingCard, ReturnType<typeof defaults>>(defaults);- })();- return Object.freeze({- create,- new: create,- defaults: () => Object.freeze(defaults()) as Partial<AppBillingCard>,- });-})();--const FfiConverterTypeAppBillingCard = (() => {- type TypeName = AppBillingCard;- class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {- read(from: RustBuffer): TypeName {- return {- brand: FfiConverterString.read(from),- last4: FfiConverterString.read(from)- };- }- write(value: TypeName, into: RustBuffer): void {- FfiConverterString.write(value.brand, into);- FfiConverterString.write(value.last4, into);- }- allocationSize(value: TypeName): number {- return FfiConverterString.allocationSize(value.brand) +- FfiConverterString.allocationSize(value.last4);-- }- };- return new FFIConverter();-})();--export type AppBillingCredit = {- /**- * What is left, US cents.- */- balanceUsdCents: bigint-}--/**- * Generated factory for {@link AppBillingCredit} record objects.- */-export const AppBillingCredit = (() => {- const defaults = () => ({- });- const create = (() => {- return uniffiCreateRecord<AppBillingCredit, ReturnType<typeof defaults>>(defaults);- })();- return Object.freeze({- create,- new: create,- defaults: () => Object.freeze(defaults()) as Partial<AppBillingCredit>,- });-})();--const FfiConverterTypeAppBillingCredit = (() => {- type TypeName = AppBillingCredit;- class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {- read(from: RustBuffer): TypeName {- return {- balanceUsdCents: FfiConverterInt64.read(from)- };- }- write(value: TypeName, into: RustBuffer): void {- FfiConverterInt64.write(value.balanceUsdCents, into);- }- allocationSize(value: TypeName): number {- return FfiConverterInt64.allocationSize(value.balanceUsdCents);-- }- };- return new FFIConverter();-})();--export type AppBillingStatus = {- /**- * Billing is on for this account (off: Settings shows no Billing row).- */- billingEnabled: boolean,- /**- * The saved default card.- */- card?: AppBillingCard,- /**- * The account's credit, when it has any.- */- credit?: AppBillingCredit,- /**- * The website billing page (credit, cards, plans).- */- billingUrl?: string-}--/**- * Generated factory for {@link AppBillingStatus} record objects.- */-export const AppBillingStatus = (() => {- const defaults = () => ({- });- const create = (() => {- return uniffiCreateRecord<AppBillingStatus, ReturnType<typeof defaults>>(defaults);- })();- return Object.freeze({- create,- new: create,- defaults: () => Object.freeze(defaults()) as Partial<AppBillingStatus>,- });-})();--const FfiConverterTypeAppBillingStatus = (() => {- type TypeName = AppBillingStatus;- class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {- read(from: RustBuffer): TypeName {- return {- billingEnabled: FfiConverterBool.read(from),- card: FfiConverterOptionalTypeAppBillingCard.read(from),- credit: FfiConverterOptionalTypeAppBillingCredit.read(from),- billingUrl: FfiConverterOptionalString.read(from)- };- }- write(value: TypeName, into: RustBuffer): void {- FfiConverterBool.write(value.billingEnabled, into);- FfiConverterOptionalTypeAppBillingCard.write(value.card, into);- FfiConverterOptionalTypeAppBillingCredit.write(value.credit, into);- FfiConverterOptionalString.write(value.billingUrl, into);- }- allocationSize(value: TypeName): number {- return FfiConverterBool.allocationSize(value.billingEnabled) +- FfiConverterOptionalTypeAppBillingCard.allocationSize(value.card) +- FfiConverterOptionalTypeAppBillingCredit.allocationSize(value.credit) +- FfiConverterOptionalString.allocationSize(value.billingUrl);-- }- };- return new FFIConverter();-})();-export enum AppTeleportCapability {/*** App and signed-in state.@@ -11349,10 +11195,6 @@ const FfiConverterTypeAppThumbnailScene = (() => {})();export enum AppSpaceProvider {- /**- * Cua Cloud.- */- Cloud = "cloud",/*** This Mac.*/@@ -11373,19 +11215,17 @@ const FfiConverterTypeAppSpaceProvider = (() => {class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {read(from: RustBuffer): TypeName {switch (ordinalConverter.read(from)) {- case 1: return AppSpaceProvider.Cloud;- case 2: return AppSpaceProvider.Local;- case 3: return AppSpaceProvider.Direct;- case 4: return AppSpaceProvider.Relay;+ case 1: return AppSpaceProvider.Local;+ case 2: return AppSpaceProvider.Direct;+ case 3: return AppSpaceProvider.Relay;default: throw new UniffiInternalError.UnexpectedEnumCase();}}write(value: TypeName, into: RustBuffer): void {switch (value) {- case AppSpaceProvider.Cloud: return ordinalConverter.write(1, into);- case AppSpaceProvider.Local: return ordinalConverter.write(2, into);- case AppSpaceProvider.Direct: return ordinalConverter.write(3, into);- case AppSpaceProvider.Relay: return ordinalConverter.write(4, into);+ case AppSpaceProvider.Local: return ordinalConverter.write(1, into);+ case AppSpaceProvider.Direct: return ordinalConverter.write(2, into);+ case AppSpaceProvider.Relay: return ordinalConverter.write(3, into);}}allocationSize(value: TypeName): number {@@ -11579,11 +11419,6 @@ export type AppSpaceProgress = {* Why the create failed.*/error?: string,- /**- * It failed because the account is out of Cua Cloud credit: the- * website billing page "Add credit" opens.- */- creditUrl?: string,/*** While it downloads: "4.2 of 22.1 GB · 85 MB/s · about 4 min"* ([`crate::spaces::creating::transfer_text`]).@@ -11635,7 +11470,6 @@ const FfiConverterTypeAppSpaceProgress = (() => {permille: FfiConverterUInt32.read(from),label: FfiConverterString.read(from),error: FfiConverterOptionalString.read(from),- creditUrl: FfiConverterOptionalString.read(from),transfer: FfiConverterOptionalString.read(from),cancellable: FfiConverterBool.read(from),cancelling: FfiConverterBool.read(from),@@ -11648,7 +11482,6 @@ const FfiConverterTypeAppSpaceProgress = (() => {FfiConverterUInt32.write(value.permille, into);FfiConverterString.write(value.label, into);FfiConverterOptionalString.write(value.error, into);- FfiConverterOptionalString.write(value.creditUrl, into);FfiConverterOptionalString.write(value.transfer, into);FfiConverterBool.write(value.cancellable, into);FfiConverterBool.write(value.cancelling, into);@@ -11660,7 +11493,6 @@ const FfiConverterTypeAppSpaceProgress = (() => {FfiConverterUInt32.allocationSize(value.permille) +FfiConverterString.allocationSize(value.label) +FfiConverterOptionalString.allocationSize(value.error) +- FfiConverterOptionalString.allocationSize(value.creditUrl) +FfiConverterOptionalString.allocationSize(value.transfer) +FfiConverterBool.allocationSize(value.cancellable) +FfiConverterBool.allocationSize(value.cancelling) +@@ -11848,10 +11680,6 @@ export type AppSpace = {* Placeholder scene.*/scene: AppThumbnailScene,- /**- * Group (cloud namespace or location word).- */- fleetId?: string,/*** Fixture machine size.*/@@ -11959,7 +11787,6 @@ const FfiConverterTypeAppSpace = (() => {lastUsedAt: FfiConverterInt64.read(from),startedAt: FfiConverterOptionalInt64.read(from),scene: FfiConverterTypeAppThumbnailScene.read(from),- fleetId: FfiConverterOptionalString.read(from),size: FfiConverterOptionalString.read(from),region: FfiConverterOptionalString.read(from),provider: FfiConverterOptionalTypeAppSpaceProvider.read(from),@@ -11988,7 +11815,6 @@ const FfiConverterTypeAppSpace = (() => {FfiConverterInt64.write(value.lastUsedAt, into);FfiConverterOptionalInt64.write(value.startedAt, into);FfiConverterTypeAppThumbnailScene.write(value.scene, into);- FfiConverterOptionalString.write(value.fleetId, into);FfiConverterOptionalString.write(value.size, into);FfiConverterOptionalString.write(value.region, into);FfiConverterOptionalTypeAppSpaceProvider.write(value.provider, into);@@ -12016,7 +11842,6 @@ const FfiConverterTypeAppSpace = (() => {FfiConverterInt64.allocationSize(value.lastUsedAt) +FfiConverterOptionalInt64.allocationSize(value.startedAt) +FfiConverterTypeAppThumbnailScene.allocationSize(value.scene) +- FfiConverterOptionalString.allocationSize(value.fleetId) +FfiConverterOptionalString.allocationSize(value.size) +FfiConverterOptionalString.allocationSize(value.region) +FfiConverterOptionalTypeAppSpaceProvider.allocationSize(value.provider) +@@ -13178,7 +13003,7 @@ export type AppChromeInput = {*/identity?: string,/**- * Cua Cloud works (signed in, or client credentials).+ * The Cua account works (signed in, or client credentials).*/cloudConfigured: boolean,/**@@ -14687,55 +14512,6 @@ const FfiConverterTypeAppCloudOffer = (() => {return new FFIConverter();})();-export type AppCloudPricing = {- /**- * USD per reserved vCPU per hour.- */- vcpuHourUsd: number,- /**- * USD per reserved GB (GiB) of memory per hour.- */- memoryGibHourUsd: number-}--/**- * Generated factory for {@link AppCloudPricing} record objects.- */-export const AppCloudPricing = (() => {- const defaults = () => ({- });- const create = (() => {- return uniffiCreateRecord<AppCloudPricing, ReturnType<typeof defaults>>(defaults);- })();- return Object.freeze({- create,- new: create,- defaults: () => Object.freeze(defaults()) as Partial<AppCloudPricing>,- });-})();--const FfiConverterTypeAppCloudPricing = (() => {- type TypeName = AppCloudPricing;- class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {- read(from: RustBuffer): TypeName {- return {- vcpuHourUsd: FfiConverterFloat64.read(from),- memoryGibHourUsd: FfiConverterFloat64.read(from)- };- }- write(value: TypeName, into: RustBuffer): void {- FfiConverterFloat64.write(value.vcpuHourUsd, into);- FfiConverterFloat64.write(value.memoryGibHourUsd, into);- }- allocationSize(value: TypeName): number {- return FfiConverterFloat64.allocationSize(value.vcpuHourUsd) +- FfiConverterFloat64.allocationSize(value.memoryGibHourUsd);-- }- };- return new FFIConverter();-})();-export enum AppDiskLevel {/*** Plenty.@@ -15533,11 +15309,6 @@ const FfiConverterTypeAppConsentItem = (() => {})();export enum AppLocation {- /**- * Cua Cloud (the SDK's `on="cloud"`). The apps do not offer it for new- * Spaces ([`CLOUD_SPACES_OFFERED`]); existing cloud Spaces still list.- */- Cloud = "cloud",/*** This Mac.*/@@ -15569,21 +15340,19 @@ const FfiConverterTypeAppLocation = (() => {class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {read(from: RustBuffer): TypeName {switch (ordinalConverter.read(from)) {- case 1: return AppLocation.Cloud;- case 2: return AppLocation.Local;- case 3: return AppLocation.Yours;- case 4: return AppLocation.Host;- case 5: return AppLocation.Auto;+ case 1: return AppLocation.Local;+ case 2: return AppLocation.Yours;+ case 3: return AppLocation.Host;+ case 4: return AppLocation.Auto;default: throw new UniffiInternalError.UnexpectedEnumCase();}}write(value: TypeName, into: RustBuffer): void {switch (value) {- case AppLocation.Cloud: return ordinalConverter.write(1, into);- case AppLocation.Local: return ordinalConverter.write(2, into);- case AppLocation.Yours: return ordinalConverter.write(3, into);- case AppLocation.Host: return ordinalConverter.write(4, into);- case AppLocation.Auto: return ordinalConverter.write(5, into);+ case AppLocation.Local: return ordinalConverter.write(1, into);+ case AppLocation.Yours: return ordinalConverter.write(2, into);+ case AppLocation.Host: return ordinalConverter.write(3, into);+ case AppLocation.Auto: return ordinalConverter.write(4, into);}}allocationSize(value: TypeName): number {@@ -15801,41 +15570,6 @@ const FfiConverterTypeAppLocalEngine = (() => {return new FFIConverter();})();-export enum AppCloudEngine {- /**- * gVisor containers.- */- Gvisor = "gvisor",- /**- * KubeVirt VMs.- */- Kubevirt = "kubevirt"-}--const FfiConverterTypeAppCloudEngine = (() => {- const ordinalConverter = FfiConverterInt32;- type TypeName = AppCloudEngine;- class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {- read(from: RustBuffer): TypeName {- switch (ordinalConverter.read(from)) {- case 1: return AppCloudEngine.Gvisor;- case 2: return AppCloudEngine.Kubevirt;- default: throw new UniffiInternalError.UnexpectedEnumCase();- }- }- write(value: TypeName, into: RustBuffer): void {- switch (value) {- case AppCloudEngine.Gvisor: return ordinalConverter.write(1, into);- case AppCloudEngine.Kubevirt: return ordinalConverter.write(2, into);- }- }- allocationSize(value: TypeName): number {- return ordinalConverter.allocationSize(0);- }- }- return new FFIConverter();-})();-export enum AppImageTier {/*** The minimum that passes `cua-spacesd doctor --strict` (what CI runs).@@ -16085,10 +15819,6 @@ export type AppSandboxImage = {* Local engine.*/local?: AppLocalEngine,- /**- * Cloud engine.- */- cloud?: AppCloudEngine,/*** `slim`, `full` or `xcode` (canonical images only).*/@@ -16144,7 +15874,6 @@ const FfiConverterTypeAppSandboxImage = (() => {summary: FfiConverterString.read(from),spacesd: FfiConverterBool.read(from),local: FfiConverterOptionalTypeAppLocalEngine.read(from),- cloud: FfiConverterOptionalTypeAppCloudEngine.read(from),tier: FfiConverterOptionalTypeAppImageTier.read(from),published: FfiConverterBool.read(from),distro: FfiConverterOptionalTypeAppImageDistro.read(from),@@ -16162,7 +15891,6 @@ const FfiConverterTypeAppSandboxImage = (() => {FfiConverterString.write(value.summary, into);FfiConverterBool.write(value.spacesd, into);FfiConverterOptionalTypeAppLocalEngine.write(value.local, into);- FfiConverterOptionalTypeAppCloudEngine.write(value.cloud, into);FfiConverterOptionalTypeAppImageTier.write(value.tier, into);FfiConverterBool.write(value.published, into);FfiConverterOptionalTypeAppImageDistro.write(value.distro, into);@@ -16179,7 +15907,6 @@ const FfiConverterTypeAppSandboxImage = (() => {FfiConverterString.allocationSize(value.summary) +FfiConverterBool.allocationSize(value.spacesd) +FfiConverterOptionalTypeAppLocalEngine.allocationSize(value.local) +- FfiConverterOptionalTypeAppCloudEngine.allocationSize(value.cloud) +FfiConverterOptionalTypeAppImageTier.allocationSize(value.tier) +FfiConverterBool.allocationSize(value.published) +FfiConverterOptionalTypeAppImageDistro.allocationSize(value.distro) +@@ -16200,7 +15927,6 @@ export enum AppRuntime_Tags {Runc = "Runc",Qemu = "Qemu",Lume = "Lume",- Kubevirt = "Kubevirt",Other = "Other"}export const AppRuntime = (() => {@@ -16340,33 +16066,6 @@ export const AppRuntime = (() => {}- type Kubevirt__interface = {- tag: AppRuntime_Tags.Kubevirt- };- /**- * KubeVirt.- */- class Kubevirt_ extends UniffiEnum implements Kubevirt__interface {- /**- * @private- * This field is private and should not be used, use `tag` instead.- */- readonly [uniffiTypeNameSymbol] = "AppRuntime";- readonly tag = AppRuntime_Tags.Kubevirt;- constructor() {- super("AppRuntime", "Kubevirt");- }-- static new(): Kubevirt_ {- return new Kubevirt_();- }-- static instanceOf(obj: any): obj is Kubevirt_ {- return obj.tag === AppRuntime_Tags.Kubevirt;- }-- }-type Other__interface = {tag: AppRuntime_Tags.Other;inner:@@ -16415,13 +16114,12 @@ Readonly<Runc: Runc_,Qemu: Qemu_,Lume: Lume_,- Kubevirt: Kubevirt_,Other: Other_});})();export type AppRuntime = InstanceType<- typeof AppRuntime['Auto' | 'Gvisor' | 'Runc' | 'Qemu' | 'Lume' | 'Kubevirt' | 'Other']+ typeof AppRuntime['Auto' | 'Gvisor' | 'Runc' | 'Qemu' | 'Lume' | 'Other']>;// FfiConverter for enum AppRuntime@@ -16436,8 +16134,7 @@ const FfiConverterTypeAppRuntime = (() => {case 3: return new AppRuntime.Runc();case 4: return new AppRuntime.Qemu();case 5: return new AppRuntime.Lume();- case 6: return new AppRuntime.Kubevirt();- case 7: return new AppRuntime.Other(FfiConverterString.read(from));+ case 6: return new AppRuntime.Other(FfiConverterString.read(from));default: throw new UniffiInternalError.UnexpectedEnumCase();}}@@ -16463,12 +16160,8 @@ const FfiConverterTypeAppRuntime = (() => {ordinalConverter.write(5, into);return;}- case AppRuntime_Tags.Kubevirt: {- ordinalConverter.write(6, into);- return;- }case AppRuntime_Tags.Other: {- ordinalConverter.write(7, into);+ ordinalConverter.write(6, into);const inner = value.inner;FfiConverterString.write(inner[0], into);return;@@ -16495,12 +16188,9 @@ const FfiConverterTypeAppRuntime = (() => {case AppRuntime_Tags.Lume: {return ordinalConverter.allocationSize(5);}- case AppRuntime_Tags.Kubevirt: {- return ordinalConverter.allocationSize(6);- }case AppRuntime_Tags.Other: {const inner = value.inner;- let size = ordinalConverter.allocationSize(7);+ let size = ordinalConverter.allocationSize(6);size += FfiConverterString.allocationSize(inner[0]);return size;}@@ -16537,11 +16227,11 @@ export type AppCreatePlan = {*/name?: string,/**- * vCPUs (local and Cua Cloud).+ * vCPUs (local and remote).*/cpus?: number,/**- * Memory MB (local and Cua Cloud).+ * Memory MB (local and remote).*/memoryMb?: number,/**@@ -16779,10 +16469,6 @@ export type AppPendingCreate = {* Why it failed.*/error?: string,- /**- * It failed for want of Cua Cloud credit: the billing page.- */- creditUrl?: string,/*** The registered Space's id once it finished; the row goes when the* registry lists it.@@ -16897,7 +16583,6 @@ const FfiConverterTypeAppPendingCreate = (() => {pulled: FfiConverterBool.read(from),permille: FfiConverterUInt32.read(from),error: FfiConverterOptionalString.read(from),- creditUrl: FfiConverterOptionalString.read(from),spaceId: FfiConverterOptionalString.read(from),image: FfiConverterOptionalString.read(from),kind: FfiConverterOptionalTypeAppSpaceKind.read(from),@@ -16928,7 +16613,6 @@ const FfiConverterTypeAppPendingCreate = (() => {FfiConverterBool.write(value.pulled, into);FfiConverterUInt32.write(value.permille, into);FfiConverterOptionalString.write(value.error, into);- FfiConverterOptionalString.write(value.creditUrl, into);FfiConverterOptionalString.write(value.spaceId, into);FfiConverterOptionalString.write(value.image, into);FfiConverterOptionalTypeAppSpaceKind.write(value.kind, into);@@ -16958,7 +16642,6 @@ const FfiConverterTypeAppPendingCreate = (() => {FfiConverterBool.allocationSize(value.pulled) +FfiConverterUInt32.allocationSize(value.permille) +FfiConverterOptionalString.allocationSize(value.error) +- FfiConverterOptionalString.allocationSize(value.creditUrl) +FfiConverterOptionalString.allocationSize(value.spaceId) +FfiConverterOptionalString.allocationSize(value.image) +FfiConverterOptionalTypeAppSpaceKind.allocationSize(value.kind) +@@ -17238,62 +16921,6 @@ const FfiConverterTypeAppCreatesState = (() => {return new FFIConverter();})();-export type AppCreditNotice = {- /**- * [`OUT_OF_CREDIT`].- */- text: string,- /**- * [`ADD_CREDIT`].- */- button: string,- /**- * The website billing page.- */- url: string-}--/**- * Generated factory for {@link AppCreditNotice} record objects.- */-export const AppCreditNotice = (() => {- const defaults = () => ({- });- const create = (() => {- return uniffiCreateRecord<AppCreditNotice, ReturnType<typeof defaults>>(defaults);- })();- return Object.freeze({- create,- new: create,- defaults: () => Object.freeze(defaults()) as Partial<AppCreditNotice>,- });-})();--const FfiConverterTypeAppCreditNotice = (() => {- type TypeName = AppCreditNotice;- class FFIConverter extends AbstractFfiConverterByteArray<TypeName> {- read(from: RustBuffer): TypeName {- return {- text: FfiConverterString.read(from),- button: FfiConverterString.read(from),- url: FfiConverterString.read(from)- };- }- write(value: TypeName, into: RustBuffer): void {- FfiConverterString.write(value.text, into);- FfiConverterString.write(value.button, into);- FfiConverterString.write(value.url, into);- }- allocationSize(value: TypeName): number {- return FfiConverterString.allocationSize(value.text) +- FfiConverterString.allocationSize(value.button) +- FfiConverterString.allocationSize(value.url);-- }- };- return new FFIConverter();-})();-export type AppDaemonCheck = {/*** The running daemon's executable (`None`: no daemon, or unknown).@@ -36874,7 +36501,7 @@ export enum AppWindowMode {*/AmbientTeleport = "ambientTeleport",Switcher = "switcher",- CreateFleet = "createFleet"+ CreateSpace = "createSpace"}const FfiConverterTypeAppWindowMode = (() => {@@ -36886,7 +36513,7 @@ const FfiConverterTypeAppWindowMode = (() => {case 1: return AppWindowMode.Ambient;case 2: return AppWindowMode.AmbientTeleport;case 3: return AppWindowMode.Switcher;- case 4: return AppWindowMode.CreateFleet;+ case 4: return AppWindowMode.CreateSpace;default: throw new UniffiInternalError.UnexpectedEnumCase();}}@@ -36895,7 +36522,7 @@ const FfiConverterTypeAppWindowMode = (() => {case AppWindowMode.Ambient: return ordinalConverter.write(1, into);case AppWindowMode.AmbientTeleport: return ordinalConverter.write(2, into);case AppWindowMode.Switcher: return ordinalConverter.write(3, into);- case AppWindowMode.CreateFleet: return ordinalConverter.write(4, into);+ case AppWindowMode.CreateSpace: return ordinalConverter.write(4, into);}}allocationSize(value: TypeName): number {@@ -37283,7 +36910,9 @@ export type AppSettings = {*/theme: AppSwitcherTheme,/**- * Where New Space starts.+ * Where New Space starts. A word this build does not know (the+ * retired `cloud`) reads as this Mac, so an old file keeps its other+ * settings.*/defaultLocation: AppLocation,/**@@ -38185,7 +37814,7 @@ export type AppSettingsInput = {*/identity?: string,/**- * Cua Cloud through client credentials (an API key): its client id.+ * The Cua account through client credentials (an API key): its client id.*/apiKeyClient?: string,/**@@ -38201,14 +37830,6 @@ export type AppSettingsInput = {* entry point).*/menuBar: boolean,- /**- * Where New Space starts.- */- defaultLocation: AppLocation,- /**- * The environment sets the default location: which variable.- */- locationLockedBy?: string,/*** The telemetry switch (none until read).*/@@ -38231,10 +37852,6 @@ export type AppSettingsInput = {* app's links only.*/teams?: AppTeamsInput,- /**- * The account's Cua Cloud billing, once read (signed in).- */- billing?: AppBillingStatus,/*** Launch at login, once the system was asked (none: no rows).*/@@ -38311,14 +37928,11 @@ const FfiConverterTypeAppSettingsInput = (() => {signIn: FfiConverterTypeAppSignInPhase.read(from),canSignOut: FfiConverterBool.read(from),menuBar: FfiConverterBool.read(from),- defaultLocation: FfiConverterTypeAppLocation.read(from),- locationLockedBy: FfiConverterOptionalString.read(from),telemetry: FfiConverterOptionalTypeAppTelemetryInput.read(from),agents: FfiConverterOptionalSequenceTypeAppAgentSettingsRow.read(from),agentsBusy: FfiConverterBool.read(from),agentsPending: FfiConverterSequenceString.read(from),teams: FfiConverterOptionalTypeAppTeamsInput.read(from),- billing: FfiConverterOptionalTypeAppBillingStatus.read(from),loginItem: FfiConverterOptionalTypeAppLoginItemInput.read(from),experiments: FfiConverterTypeAppExperiments.read(from),keyvaultAutoWipe: FfiConverterOptionalBoolean.read(from),@@ -38337,14 +37951,11 @@ const FfiConverterTypeAppSettingsInput = (() => {FfiConverterTypeAppSignInPhase.write(value.signIn, into);FfiConverterBool.write(value.canSignOut, into);FfiConverterBool.write(value.menuBar, into);- FfiConverterTypeAppLocation.write(value.defaultLocation, into);- FfiConverterOptionalString.write(value.locationLockedBy, into);FfiConverterOptionalTypeAppTelemetryInput.write(value.telemetry, into);FfiConverterOptionalSequenceTypeAppAgentSettingsRow.write(value.agents, into);FfiConverterBool.write(value.agentsBusy, into);FfiConverterSequenceString.write(value.agentsPending, into);FfiConverterOptionalTypeAppTeamsInput.write(value.teams, into);- FfiConverterOptionalTypeAppBillingStatus.write(value.billing, into);FfiConverterOptionalTypeAppLoginItemInput.write(value.loginItem, into);FfiConverterTypeAppExperiments.write(value.experiments, into);FfiConverterOptionalBoolean.write(value.keyvaultAutoWipe, into);@@ -38362,14 +37973,11 @@ const FfiConverterTypeAppSettingsInput = (() => {FfiConverterTypeAppSignInPhase.allocationSize(value.signIn) +FfiConverterBool.allocationSize(value.canSignOut) +FfiConverterBool.allocationSize(value.menuBar) +- FfiConverterTypeAppLocation.allocationSize(value.defaultLocation) +- FfiConverterOptionalString.allocationSize(value.locationLockedBy) +FfiConverterOptionalTypeAppTelemetryInput.allocationSize(value.telemetry) +FfiConverterOptionalSequenceTypeAppAgentSettingsRow.allocationSize(value.agents) +FfiConverterBool.allocationSize(value.agentsBusy) +FfiConverterSequenceString.allocationSize(value.agentsPending) +FfiConverterOptionalTypeAppTeamsInput.allocationSize(value.teams) +- FfiConverterOptionalTypeAppBillingStatus.allocationSize(value.billing) +FfiConverterOptionalTypeAppLoginItemInput.allocationSize(value.loginItem) +FfiConverterTypeAppExperiments.allocationSize(value.experiments) +FfiConverterOptionalBoolean.allocationSize(value.keyvaultAutoWipe) +@@ -39396,7 +39004,7 @@ const FfiConverterTypeAppSidebarRow = (() => {export type AppSidebarSection = {/**- * "Cua Cloud", "This Mac", "Connected", "My computers"+ * "This Mac", "Connected", "My computers"* (`spaces.sidebar.section.*`).*/title: AppMsg,@@ -39736,7 +39344,7 @@ export type AppSignInFooterInput = {*/identity?: string,/**- * Cua Cloud works through client credentials (an API key).+ * The Cua account works through client credentials (an API key).*/cloudConfigured: boolean,/**@@ -40003,11 +39611,6 @@ export type AppSpaceDetail = {* The sections under the facts, in order (Stream, Agents, Teleport).*/sections: Array<string>,- /**- * A cloud Space refused for want of credit: one line and "Add- * credit" (the website billing page).- */- creditNotice?: AppCreditNotice,/*** Why turning it off or on failed, shown inline under the preview.*/@@ -40066,7 +39669,6 @@ const FfiConverterTypeAppSpaceDetail = (() => {actions: FfiConverterSequenceTypeAppDetailAction.read(from),confirm: FfiConverterTypeAppDeleteConfirm.read(from),sections: FfiConverterSequenceString.read(from),- creditNotice: FfiConverterOptionalTypeAppCreditNotice.read(from),powerError: FfiConverterOptionalString.read(from),access: FfiConverterOptionalTypeAppMachineAccessNotice.read(from),desktopNote: FfiConverterOptionalString.read(from),@@ -40088,7 +39690,6 @@ const FfiConverterTypeAppSpaceDetail = (() => {FfiConverterSequenceTypeAppDetailAction.write(value.actions, into);FfiConverterTypeAppDeleteConfirm.write(value.confirm, into);FfiConverterSequenceString.write(value.sections, into);- FfiConverterOptionalTypeAppCreditNotice.write(value.creditNotice, into);FfiConverterOptionalString.write(value.powerError, into);FfiConverterOptionalTypeAppMachineAccessNotice.write(value.access, into);FfiConverterOptionalString.write(value.desktopNote, into);@@ -40109,7 +39710,6 @@ const FfiConverterTypeAppSpaceDetail = (() => {FfiConverterSequenceTypeAppDetailAction.allocationSize(value.actions) +FfiConverterTypeAppDeleteConfirm.allocationSize(value.confirm) +FfiConverterSequenceString.allocationSize(value.sections) +- FfiConverterOptionalTypeAppCreditNotice.allocationSize(value.creditNotice) +FfiConverterOptionalString.allocationSize(value.powerError) +FfiConverterOptionalTypeAppMachineAccessNotice.allocationSize(value.access) +FfiConverterOptionalString.allocationSize(value.desktopNote) +@@ -41666,10 +41266,6 @@ export type AppWizardEnv = {* Where "Run on" starts (Settings, `cua config set default.on`).*/defaultLocation: AppLocation,- /**- * Signed in (or client credentials).- */- cloudAvailable: boolean,/*** A local container backend or Lume exists.*/@@ -41711,10 +41307,6 @@ export type AppWizardEnv = {* when known.*/storage?: AppLocalStorage,- /**- * This account's Cua Cloud rates, when known (no estimate without).- */- cloudPricing?: AppCloudPricing,/*** The user's connected clouds (`cloud_status`), for "Your cloud"* (offered only while its experiment is on: [`offered_clouds`]).@@ -41764,7 +41356,6 @@ const FfiConverterTypeAppWizardEnv = (() => {read(from: RustBuffer): TypeName {return {defaultLocation: FfiConverterTypeAppLocation.read(from),- cloudAvailable: FfiConverterBool.read(from),localAvailable: FfiConverterBool.read(from),localReason: FfiConverterOptionalString.read(from),localBackends: FfiConverterOptionalSequenceString.read(from),@@ -41774,7 +41365,6 @@ const FfiConverterTypeAppWizardEnv = (() => {lumeSource: FfiConverterOptionalString.read(from),linuxSource: FfiConverterOptionalString.read(from),storage: FfiConverterOptionalTypeAppLocalStorage.read(from),- cloudPricing: FfiConverterOptionalTypeAppCloudPricing.read(from),clouds: FfiConverterSequenceTypeAppConnectedCloud.read(from),hosts: FfiConverterSequenceTypeAppSpaceHost.read(from),experiments: FfiConverterTypeAppExperiments.read(from),@@ -41784,7 +41374,6 @@ const FfiConverterTypeAppWizardEnv = (() => {}write(value: TypeName, into: RustBuffer): void {FfiConverterTypeAppLocation.write(value.defaultLocation, into);- FfiConverterBool.write(value.cloudAvailable, into);FfiConverterBool.write(value.localAvailable, into);FfiConverterOptionalString.write(value.localReason, into);FfiConverterOptionalSequenceString.write(value.localBackends, into);@@ -41794,7 +41383,6 @@ const FfiConverterTypeAppWizardEnv = (() => {FfiConverterOptionalString.write(value.lumeSource, into);FfiConverterOptionalString.write(value.linuxSource, into);FfiConverterOptionalTypeAppLocalStorage.write(value.storage, into);- FfiConverterOptionalTypeAppCloudPricing.write(value.cloudPricing, into);FfiConverterSequenceTypeAppConnectedCloud.write(value.clouds, into);FfiConverterSequenceTypeAppSpaceHost.write(value.hosts, into);FfiConverterTypeAppExperiments.write(value.experiments, into);@@ -41803,7 +41391,6 @@ const FfiConverterTypeAppWizardEnv = (() => {}allocationSize(value: TypeName): number {return FfiConverterTypeAppLocation.allocationSize(value.defaultLocation) +- FfiConverterBool.allocationSize(value.cloudAvailable) +FfiConverterBool.allocationSize(value.localAvailable) +FfiConverterOptionalString.allocationSize(value.localReason) +FfiConverterOptionalSequenceString.allocationSize(value.localBackends) +@@ -41813,7 +41400,6 @@ const FfiConverterTypeAppWizardEnv = (() => {FfiConverterOptionalString.allocationSize(value.lumeSource) +FfiConverterOptionalString.allocationSize(value.linuxSource) +FfiConverterOptionalTypeAppLocalStorage.allocationSize(value.storage) +- FfiConverterOptionalTypeAppCloudPricing.allocationSize(value.cloudPricing) +FfiConverterSequenceTypeAppConnectedCloud.allocationSize(value.clouds) +FfiConverterSequenceTypeAppSpaceHost.allocationSize(value.hosts) +FfiConverterTypeAppExperiments.allocationSize(value.experiments) +@@ -64976,12 +64562,6 @@ const FfiConverterOptionalTypeAppAgentDetailView = new FfiConverterOptional(FfiC// FfiConverter for AppApproveRequest | undefinedconst FfiConverterOptionalTypeAppApproveRequest = new FfiConverterOptional(FfiConverterTypeAppApproveRequest);-// FfiConverter for AppBillingCard | undefined-const FfiConverterOptionalTypeAppBillingCard = new FfiConverterOptional(FfiConverterTypeAppBillingCard);--// FfiConverter for AppBillingCredit | undefined-const FfiConverterOptionalTypeAppBillingCredit = new FfiConverterOptional(FfiConverterTypeAppBillingCredit);-// FfiConverter for Array<AppTeleportMove>const FfiConverterSequenceTypeAppTeleportMove = new FfiConverterArray(FfiConverterTypeAppTeleportMove);@@ -65063,9 +64643,6 @@ const FfiConverterSequenceTypeAppCloudOffer = new FfiConverterArray(FfiConverter// FfiConverter for AppLocalEngine | undefinedconst FfiConverterOptionalTypeAppLocalEngine = new FfiConverterOptional(FfiConverterTypeAppLocalEngine);-// FfiConverter for AppCloudEngine | undefined-const FfiConverterOptionalTypeAppCloudEngine = new FfiConverterOptional(FfiConverterTypeAppCloudEngine);-// FfiConverter for AppImageTier | undefinedconst FfiConverterOptionalTypeAppImageTier = new FfiConverterOptional(FfiConverterTypeAppImageTier);@@ -65513,9 +65090,6 @@ const FfiConverterSequenceTypeAppTeamInput = new FfiConverterArray(FfiConverterT// FfiConverter for AppTeamsInput | undefinedconst FfiConverterOptionalTypeAppTeamsInput = new FfiConverterOptional(FfiConverterTypeAppTeamsInput);-// FfiConverter for AppBillingStatus | undefined-const FfiConverterOptionalTypeAppBillingStatus = new FfiConverterOptional(FfiConverterTypeAppBillingStatus);-// FfiConverter for AppLoginItemInput | undefinedconst FfiConverterOptionalTypeAppLoginItemInput = new FfiConverterOptional(FfiConverterTypeAppLoginItemInput);@@ -65558,9 +65132,6 @@ const FfiConverterOptionalTypeAppSignInToast = new FfiConverterOptional(FfiConve// FfiConverter for Array<AppDetailAction>const FfiConverterSequenceTypeAppDetailAction = new FfiConverterArray(FfiConverterTypeAppDetailAction);-// FfiConverter for AppCreditNotice | undefined-const FfiConverterOptionalTypeAppCreditNotice = new FfiConverterOptional(FfiConverterTypeAppCreditNotice);-// FfiConverter for AppNewSpaceOn | undefinedconst FfiConverterOptionalTypeAppNewSpaceOn = new FfiConverterOptional(FfiConverterTypeAppNewSpaceOn);@@ -65591,9 +65162,6 @@ const FfiConverterOptionalMapStringString = new FfiConverterOptional(FfiConverte// FfiConverter for AppLocalStorage | undefinedconst FfiConverterOptionalTypeAppLocalStorage = new FfiConverterOptional(FfiConverterTypeAppLocalStorage);-// FfiConverter for AppCloudPricing | undefined-const FfiConverterOptionalTypeAppCloudPricing = new FfiConverterOptional(FfiConverterTypeAppCloudPricing);-// FfiConverter for Array<AppConnectedCloud>const FfiConverterSequenceTypeAppConnectedCloud = new FfiConverterArray(FfiConverterTypeAppConnectedCloud);@@ -67012,9 +66580,6 @@ export default Object.freeze({FfiConverterTypeAppApproveSheetView,FfiConverterTypeAppAuditInput,FfiConverterTypeAppBannerTone,- FfiConverterTypeAppBillingCard,- FfiConverterTypeAppBillingCredit,- FfiConverterTypeAppBillingStatus,FfiConverterTypeAppCatalogEntry,FfiConverterTypeAppChecklistAction,FfiConverterTypeAppChecklistRow,@@ -67035,10 +66600,8 @@ export default Object.freeze({FfiConverterTypeAppCloudConnectRequest,FfiConverterTypeAppCloudConnectState,FfiConverterTypeAppCloudConnectView,- FfiConverterTypeAppCloudEngine,FfiConverterTypeAppCloudField,FfiConverterTypeAppCloudOffer,- FfiConverterTypeAppCloudPricing,FfiConverterTypeAppCloudProviderInput,FfiConverterTypeAppCloudProviderRow,FfiConverterTypeAppCloudTargetArgs,@@ -67055,7 +66618,6 @@ export default Object.freeze({FfiConverterTypeAppCreatePlan,FfiConverterTypeAppCreateSpaceArgs,FfiConverterTypeAppCreatesState,- FfiConverterTypeAppCreditNotice,FfiConverterTypeAppDaemonCheck,FfiConverterTypeAppDeleteConfirm,FfiConverterTypeAppDesktopCover,diff --git a/apps/cua-spaces-desktop/test/bridge-native.test.ts b/apps/cua-spaces-desktop/test/bridge-native.test.tsindex f1202eb98a..9f9c747c4c 100644--- a/apps/cua-spaces-desktop/test/bridge-native.test.ts+++ b/apps/cua-spaces-desktop/test/bridge-native.test.ts@@ -218,7 +218,7 @@ describe.skipIf(!built)("the bridge on the app core", () => {const list = (await call("spaces.list")) as { loaded: boolean; spaces: { space: { id: string; os: string; status: string }; detail: { title: string } }[] };expect(list.loaded).toBe(true);// In the core's order; This machine is there because this app manages a host.- expect(list.spaces.map((s) => s.space.id).sort()).toEqual(["cloud:builder", "direct:10.0.0.5:3211", "local:aurora", "this-mac"]);+ expect(list.spaces.map((s) => s.space.id).sort()).toEqual(["direct:10.0.0.5:3211", "direct:builder", "local:aurora", "this-mac"]);const aurora = list.spaces.find((s) => s.space.id === "local:aurora")!;expect(aurora.space).toMatchObject({ os: "linux", status: "running" });expect(typeof aurora.detail.title).toBe("string");diff --git a/apps/cua-spaces-desktop/test/fixtures.ts b/apps/cua-spaces-desktop/test/fixtures.tsindex 6c3dc4bca2..8d72d63092 100644--- a/apps/cua-spaces-desktop/test/fixtures.ts+++ b/apps/cua-spaces-desktop/test/fixtures.ts@@ -64,7 +64,7 @@ export function sampleRows(n: Native): AppSpaceRow[] {power: "suspend",powerState: "running",}),- row({ id: "cloud:builder", name: "builder", provider: "cloud", features: ["desktop_stream"], addedAt: "2026-09-24T08:00:00Z", os: n.AppSpaceOs.Linux, osName: "Arch Linux", reachable: false, error: "timed out" }),+ row({ id: "direct:builder", name: "builder", provider: "direct", features: ["desktop_stream"], addedAt: "2026-09-24T08:00:00Z", os: n.AppSpaceOs.Linux, osName: "Arch Linux", reachable: false, error: "timed out" }),row({ id: "direct:10.0.0.5:3211", name: "10.0.0.5:3211", provider: "direct", addedAt: "2026-09-23T08:00:00Z", os: n.AppSpaceOs.Windows, osName: "Windows" }),];}@@ -167,15 +167,12 @@ export class FixtureSpacesBackend implements SpacesBackend {async localStorage() {return null;}- async cloudAvailable() {+ async loggedIn() {return false;}async runningMacosVms() {return 1;}- async cloudPricing() {- return null;- }async usage() {return null;}diff --git a/apps/cua-spaces-desktop/test/host-bridge.test.ts b/apps/cua-spaces-desktop/test/host-bridge.test.tsindex 2b93f7f002..fda5b1cce0 100644--- a/apps/cua-spaces-desktop/test/host-bridge.test.ts+++ b/apps/cua-spaces-desktop/test/host-bridge.test.ts@@ -551,9 +551,6 @@ describe.skipIf(!built)("This machine, Devices and Settings on the app core", ()expect(model.settings.autoConnect).toBe(false);await call("settings.choose", { row: "team-current", option: "org-2" });expect(model.settings.currentTeamId).toBe("org-2");- await call("settings.choose", { row: "default-location", option: "cloud" });- // Cua Cloud has ended: the default stays on this machine.- expect(model.settings.defaultLocation).toBe(native.AppLocation.Local);await call("settings.choose", { row: "telemetry", option: "off" });expect(model.telemetry?.status().enabled).toBe(false);await call("settings.choose", { row: "launch-at-login", option: "on" });@@ -605,7 +602,7 @@ describe.skipIf(!built)("This machine, Devices and Settings on the app core", ()it("asks for Local Network access when a Space is created on this machine", async () => {let asked = 0;model.host.localNetwork = { request: () => asked++ };- await call("spaces.create", { config: { image: "ghcr.io/trycua/linux:24.04", kind: "container", on: "cloud" }, pendingId: "pending:c1", os: "linux" });+ await call("spaces.create", { config: { image: "ghcr.io/trycua/linux:24.04", kind: "container", on: "host:mini" }, pendingId: "pending:c1", os: "linux" });expect(asked).toBe(0);await call("spaces.create", { config: { image: "ghcr.io/trycua/linux:24.04", kind: "container", on: "local" }, pendingId: "pending:l1", os: "linux" });expect(asked).toBe(1);diff --git a/apps/cua-spaces-desktop/test/notch-protocol.test.ts b/apps/cua-spaces-desktop/test/notch-protocol.test.tsindex a97b6c447d..1b8fb1cd13 100644--- a/apps/cua-spaces-desktop/test/notch-protocol.test.ts+++ b/apps/cua-spaces-desktop/test/notch-protocol.test.ts@@ -44,7 +44,7 @@ function bindingView() {targeted: false,symbol: "ubuntu",label: "build, starting",- location: "Cua Cloud",+ location: "This Mac",progress: 420,progressLabel: "Starting",signedIn: false,diff --git a/apps/cua-spaces-desktop/test/spaces-model.test.ts b/apps/cua-spaces-desktop/test/spaces-model.test.tsindex cd93ac73c0..e1866bf903 100644--- a/apps/cua-spaces-desktop/test/spaces-model.test.ts+++ b/apps/cua-spaces-desktop/test/spaces-model.test.ts@@ -275,11 +275,3 @@ describe("LiveSpacesBackend's runtime settings", () => {expect(await backend("win32").linuxSource()).toBeNull();});});--describe("LiveSpacesBackend and Cua Cloud, which has ended", () => {- it("New Space asks no cloud API for pricing", async () => {- const backend = new LiveSpacesBackend({} as Native, {} as never, {}, fetch, "darwin");- expect(await backend.cloudPricing()).toBeNull();- });-});-diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swiftindex b26d834a3f..0ac7ae2e00 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppEnvironment.swift@@ -111,7 +111,6 @@ public enum AppEnvironment {let model = AppModel(backend: backend, keyvault: keyvault, onboarding: onboarding,settingsPath: settingsPath,host: host, account: account, telemetry: telemetry, agentSetup: agents,- billing: fixtures ? FixtureBilling() : PendingBilling(gate: gate),devices: devices,presence: fixtures ? FixturePresence() : LivePresence(),loginItem: fixtures ? fixtureLoginItem(env["CUA_SPACES_LOGIN_ITEM"]) : MainAppLoginItem(),@@ -193,7 +192,7 @@ public enum AppEnvironment {return LiveServices(backend: live, live: live, account: LiveAccount(auth: auth),agentSetup: LiveAgentSetup(inner: live.cua.agentSetup(), cuaBinary: bundledCuaPath),- billing: LiveBilling(cua: live.cua), devices: LiveDevices.make(auth: auth),+ devices: LiveDevices.make(auth: auth),host: CuaSDK.Host(cuaHome: nil), daemonError: daemonError)} catch {// Say so: an empty list (and an empty notch) would look like@@ -477,8 +476,7 @@ public enum AppEnvironment {await model.openNativeNewSpace()let w = model.wizardif let image = env["CUA_SPACES_WIZARD_IMAGE"] { w.send(.chooseImage(imageRef: image)) }- w.send(.setPlacement(placement: env["CUA_SPACES_WIZARD_ON"] == "cloud" ? .cloud- : env["CUA_SPACES_WIZARD_ON"] == "yours" ? .yours : .local))+ w.send(.setPlacement(placement: env["CUA_SPACES_WIZARD_ON"] == "yours" ? .yours : .local))w.send(.next)if let disk = env["CUA_SPACES_WIZARD_DISK"].flatMap(UInt32.init) { w.send(.setDisk(diskGb: disk)) }if let cpus = env["CUA_SPACES_WIZARD_CPUS"].flatMap(UInt32.init) { w.send(.setCpus(cpus: cpus)) }@@ -578,7 +576,7 @@ public enum AppEnvironment {model.notch.setActivity(hotspot: false, transfer: AppNotchTransfer(sent: 600, total: 1000))case "notch-activity-provisioning":if var s = model.notch.spaces.first(where: { $0.id != "this-mac" }) {- s.id = "cloud:starter"+ s.id = "direct:starter"s.name = "Starter"s.status = .provisionings.startedAt = Int64(Date().timeIntervalSince1970 * 1000) - 40_000diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swiftindex f916d88490..6ed9f1f2e5 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppModel.swift@@ -124,7 +124,8 @@ public final class AppModel {let agentSetup: AgentSetupRunning?/// The signed-in account.public private(set) var identity: String?- /// Cua Cloud can be used.+ /// The session's `cloudConfigured` field: nothing probes it any more+ /// (Cua Cloud has ended), so it stays false.public private(set) var cloudConfigured = false/// The Settings sign-in in progress.public private(set) var signIn: AppSignInPhase = .idle@@ -140,10 +141,6 @@ public final class AppModel {/// The attempt in progress asked for a code instead of the browser's way back.private var signInByCode = falsepublic private(set) var telemetryInput: AppTelemetryInput?- /// The account's Cua Cloud billing (Settings, Billing), once read.- public private(set) var billingStatus: AppBillingStatus?- /// Cua Cloud billing (nil: no Billing row).- let billing: BillingRunning?/// Reads the account's Teams from the Spaces API (nil: Settings shows/// the account app's links only). Set by `AppEnvironment`.public var teamsReader: TeamsReading?@@ -189,7 +186,7 @@ public final class AppModel {onboarding: OnboardingModel, settingsPath: String,host: HostRunning? = nil, account: AccountRunning? = nil,telemetry: TelemetryRunning? = nil, agentSetup: AgentSetupRunning? = nil,- billing: BillingRunning? = nil, devices: DevicesRunning? = nil,+ devices: DevicesRunning? = nil,presence: PresenceChecking = LivePresence(), loginItem: LoginItemControlling? = nil,startup: StartupModel? = nil, appVersion: String? = nil) {self.backend = backend@@ -205,7 +202,6 @@ public final class AppModel {let fixtures = backend as? FixtureSpacesBackendself.elastic = ElasticModel(tools: backend as? CloudToolRunning,ledger: fixtures.map { fx in { fx.fixtureElastic ? FixtureSpacesBackend.fixtureLedger() : nil } })- self.billing = billingself.loginItem = loginItemself.host = HostModel(host: host)self.account = account@@ -220,10 +216,10 @@ public final class AppModel {if let appVersion { settings = appSettingsResolveNewUi(settings: settings, version: appVersion) }self.settings = settingsself.wizard = WizardModel(env: AppWizardEnv(- defaultLocation: settings.defaultLocation, cloudAvailable: false,+ defaultLocation: settings.defaultLocation,localAvailable: true, localReason: nil, localBackends: nil, localDetails: nil,maxCpus: UInt32(max(2, min(16, ProcessInfo.processInfo.activeProcessorCount))),- hostArch: Self.hostArch, lumeSource: nil, linuxSource: nil, storage: nil, cloudPricing: nil, clouds: [], hosts: [],+ hostArch: Self.hostArch, lumeSource: nil, linuxSource: nil, storage: nil, clouds: [], hosts: [],experiments: settings.experiments, gpus: nil, nameSeed: nil))self.notch = NotchModel()// The notch tiles and the preview cover read one thumbnail store,@@ -877,7 +873,6 @@ public final class AppModel {// Mac's Spaces show as soon as the daemon lists them, and "This// machine" joins them once the host answered (it recomposes then).async let hostRead: Void = refreshHostThenRecompose()- async let cloud = backend.cloudAvailable()defer { followIncompleteList() }do {let (list, read) = try await readRows(fresh: fresh)@@ -885,7 +880,6 @@ public final class AppModel {lastListAnswer = lastListOk// A read from before a newer one already shown is out of date.guard read >= rowsShownRead else {- cloudConfigured = await cloudawait hostReadreturn}@@ -902,7 +896,6 @@ public final class AppModel {// last known ones (this Mac's are current).rosterError = list.notice.isEmpty ? nil: "Could not reach your other computers. Their Spaces may be out of date."- cloudConfigured = await cloudawait hostRead// Your machines' load for their sidebar lines, every so often// (each machine is asked; never holds up the list).@@ -928,7 +921,6 @@ public final class AppModel {} catch TimeoutError.timedOut {// The daemon is slow or gone: the list stays as it was, and the// poll reconnects when it stays stale (`checkListHealth`).- cloudConfigured = await cloudawait hostRead} catch {if Self.daemonAnswered(error) { lastListAnswer = listClock() }@@ -936,7 +928,6 @@ public final class AppModel {rosterError = loaded? "Could not refresh Spaces. Previously loaded rows may be out of date.": "Could not load Spaces. Try refreshing again."- cloudConfigured = await cloudawait hostRead}}@@ -1030,27 +1021,25 @@ public final class AppModel {public func newSpaceEnv() async -> AppWizardEnv {async let runtimesProbe = backend.localRuntimes()async let storageProbe = backend.localStorage()- async let pricingProbe = backend.cloudPricing()async let gpusProbe = backend.gpuChoices()async let hostsProbe = backend.hosts()- async let cloudProbe = backend.cloudAvailable()async let lumeProbe = backend.lumeSource()async let linuxProbe = backend.linuxSource()async let macosVmsProbe = backend.runningMacosVms()await self.cloud.refresh()- let (runtimes, storage, pricing, gpus, cloud) = await (runtimesProbe, storageProbe, pricingProbe, gpusProbe, cloudProbe)+ let (runtimes, storage, gpus) = await (runtimesProbe, storageProbe, gpusProbe)(lumeSource, linuxSource) = await (lumeProbe, linuxProbe)hosts = await hostsProbe// Lume did not answer this time: keep what it said last (a VM that// stopped since shows on the next read that answers).runningMacosVms = await macosVmsProbe ?? runningMacosVms- return wizardEnv(cloud: cloud, runtimes: runtimes, storage: storage, pricing: pricing, gpus: gpus)+ return wizardEnv(runtimes: runtimes, storage: storage, gpus: gpus)}/// What New Space knows without asking anything (no probe, no wait):/// the env New UI gets while the live services are still starting.public func knownNewSpaceEnv() -> AppWizardEnv {- wizardEnv(cloud: false, runtimes: nil, storage: nil, pricing: nil, gpus: nil)+ wizardEnv(runtimes: nil, storage: nil, gpus: nil)}/// The live services are in (the launch's stand-ins have them): until@@ -1141,18 +1130,18 @@ public final class AppModel {return e}- private func wizardEnv(cloud available: Bool, runtimes: (ready: [String], details: [String: String])?,- storage: LocalStorage?, pricing: AppCloudPricing?,+ private func wizardEnv(runtimes: (ready: [String], details: [String: String])?,+ storage: LocalStorage?,gpus: [AppGpuChoice]?) -> AppWizardEnv {let backends = runtimes?.readyreturn wizardEnv(from: AppWizardEnv(- defaultLocation: settings.defaultLocation, cloudAvailable: available,+ defaultLocation: settings.defaultLocation,localAvailable: backends.map { !$0.isEmpty } ?? true,localReason: backends?.isEmpty == true ? "No local runtime found (Docker or Lume)." : nil,localBackends: backends, localDetails: runtimes?.details, maxCpus: wizard.env.maxCpus,hostArch: Self.hostArch, lumeSource: lumeSource, linuxSource: linuxSource,storage: storage.map(Self.wizardStorage),- cloudPricing: available ? pricing : nil, clouds: [], hosts: [],+ clouds: [], hosts: [],experiments: settings.experiments, gpus: gpus, nameSeed: nil))}@@ -1233,7 +1222,7 @@ public final class AppModel {// second row next to this one, and a failure names the machine.let machine = args.on.hasPrefix("host:") ? String(args.on.dropFirst("host:".count)) : nilsendCreate(.start(id: pendingId, name: args.name ?? "", os: os,- provider: args.on == "cloud" ? .cloud : args.on == "local" ? .local : .relay,+ provider: args.on == "local" ? .local : .relay,now: Self.nowMs(),image: args.image, kind: args.kind, hostArch: Self.hostArch, gpu: args.gpu != nil,host: machine, hostName: machine.flatMap(machineName(of:))))@@ -1646,10 +1635,10 @@ public final class AppModel {public var settingsPage: AppSettingsPage {appSettingsPage(input: AppSettingsInput(identity: identity, apiKeyClient: nil, signIn: signIn, canSignOut: account != nil && identity != nil,- menuBar: settings.menuBar, defaultLocation: settings.defaultLocation, locationLockedBy: nil,+ menuBar: settings.menuBar,telemetry: telemetryInput, agents: agentRows, agentsBusy: agentsBusy, agentsPending: agentsPending,teams: teamsSettingsInput,- billing: identity == nil ? nil : billingStatus, loginItem: loginItemInput,+ loginItem: loginItemInput,experiments: settings.experiments, keyvaultAutoWipe: keyvault.autoWipe,keyvaultUnlockPrompt: keyvault.unlockPromptShows,keyvaultSiteIcons: settings.keyvaultSiteIcons, keyvaultProtection: keyvault.page.protection,@@ -1830,21 +1819,12 @@ public final class AppModel {telemetryInput = telemetry?.status()readLoginItem()await storage.load()- await reloadBilling()await reloadTeams()await reloadAgents()await keyvault.refresh()}- func reloadBilling() async {- guard identity != nil, let billing else {- billingStatus = nil- return- }- billingStatus = try? await billing.status()- }-- /// Opens a website page (Manage billing, Add credit, the account app's Teams page).+ /// Opens a website page (the account app's Teams page and billing).public func openBillingPage(_ raw: String) {guard let url = URL(string: raw), url.scheme == "https" || url.scheme == "http" else { return }BillingBrowser.open(url)@@ -1896,9 +1876,6 @@ public final class AppModel {} catch {show(error: LiveSpacesBackend.words(error))}- case "default-location":- settings.defaultLocation = .local // Cua Cloud has ended: only This Mac is a default- saveSettings()case "auto-connect":settings.autoConnect = option == "on"saveSettings()@@ -1941,7 +1918,7 @@ public final class AppModel {openOnboarding?()case "launch-at-login-approve":loginItem?.openSystemSettings()- case "billing", "teams-manage", "teams-billing":+ case "teams-manage", "teams-billing":// The account app (app.cua.ai): invites, roles and plans for// teams, billing.if let url = settingsPage.sections.flatMap(\.rows).first(where: { $0.id == row })?.linkUrl {diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppServices.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppServices.swiftindex be9b716f15..1ea0a5813b 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppServices.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppServices.swift@@ -383,50 +383,6 @@ public final class FixtureAccount: AccountRunning, @unchecked Sendable {public func signOut() async throws { current = nil }}-// MARK: - Cua Cloud billing--/// The account's Cua Cloud billing: the credit left and the account app's-/// billing page. The app takes no payment details; the account app does.-public protocol BillingRunning: AnyObject, Sendable {- /// The status as the app core takes it.- func status() async throws -> AppBillingStatus-}--/// The account app's billing page. Billing moves to app.cua.ai; the row stays-/// hidden until that design lands (`AccountURLs.billingEnabled`).-public enum AccountURLs {- public static let billing = "https://app.cua.ai/billing"- public static let billingEnabled = false-}--/// Billing has no service behind it: Cua Cloud has ended. It reports "billing-/// not enabled" with no network call, so Settings hides the row and a refused-/// cloud Space offers no Add credit.-public final class LiveBilling: BillingRunning, @unchecked Sendable {- let cua: Cua- public init(cua: Cua) { self.cua = cua }-- public func status() async throws -> AppBillingStatus {- AppBillingStatus(- billingEnabled: AccountURLs.billingEnabled, card: nil, credit: nil,- billingUrl: AccountURLs.billingEnabled ? AccountURLs.billing : nil)- }-}--/// A fixture account's billing (captures, tests): $10 of credit.-public final class FixtureBilling: BillingRunning, @unchecked Sendable {- public var current: AppBillingStatus-- public init(balanceCents: Int64 = 1000, enabled: Bool = true) {- current = AppBillingStatus(- billingEnabled: enabled, card: nil,- credit: AppBillingCredit(balanceUsdCents: balanceCents),- billingUrl: AccountURLs.billing)- }-- public func status() async throws -> AppBillingStatus { current }-}-// MARK: - Teams/// The account's Teams from the Spaces API (api.cua.ai, api.staging.cua.ai@@ -498,8 +454,7 @@ public final class FixtureTeams: TeamsReading, @unchecked Sendable {public func ackShareRemovals() async throws { removals = [] }}-/// Opens the website billing page (Settings' Manage billing, a refused-/// cloud Space's Add credit). In debug builds `CUA_SPACES_BROWSER` names+/// Opens an account-app page (Teams, Teams billing). In debug builds `CUA_SPACES_BROWSER` names/// another app to open it with (captures use their own window, never the/// person's browser).@MainActordiff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppStartup.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppStartup.swiftindex 426d58d40d..519baec462 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppStartup.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/AppStartup.swift@@ -502,21 +502,19 @@ public struct LiveServices: @unchecked Sendable {public var live: LiveSpacesBackend?public var account: AccountRunning?public var agentSetup: AgentSetupRunning?- public var billing: BillingRunning?public var devices: DevicesRunning?public var host: HostRunningpublic var startError: String?public var daemonError: String?public init(backend: SpacesBackend, live: LiveSpacesBackend? = nil, account: AccountRunning? = nil,- agentSetup: AgentSetupRunning? = nil, billing: BillingRunning? = nil,+ agentSetup: AgentSetupRunning? = nil,devices: DevicesRunning? = nil, host: HostRunning = FixtureHost(),startError: String? = nil, daemonError: String? = nil) {self.backend = backendself.live = liveself.account = accountself.agentSetup = agentSetup- self.billing = billingself.devices = devicesself.host = hostself.startError = startError@@ -638,7 +636,6 @@ public final class PendingSpacesBackend: SpacesBackend, AgentsToolRunning, Cloudpublic func placementOverflow() async -> Bool? { await b().placementOverflow() }public func setPlacementOverflow(_ on: Bool) async throws { try await b().setPlacementOverflow(on) }public func localStorage() async -> LocalStorage? { await b().localStorage() }- public func cloudAvailable() async -> Bool { await b().cloudAvailable() }public func runningMacosVms() async -> Int? { await b().runningMacosVms() }// The Machines page: Remove from account and each computer's health// checks (the protocol's defaults would refuse them).@@ -646,7 +643,6 @@ public final class PendingSpacesBackend: SpacesBackend, AgentsToolRunning, Cloudpublic func machineHealth(machine: String?) async throws -> AppMachinesViewHealth {try await b().machineHealth(machine: machine)}- public func cloudPricing() async -> AppCloudPricing? { await b().cloudPricing() }public func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? {try await b().teleportContext(id: id)}@@ -731,17 +727,6 @@ public final class PendingAgentSetup: AgentSetupRunning, @unchecked Sendable {public func signIn(agent: String) async throws { try await s().signIn(agent: agent) }}-/// Cua Cloud billing until the SDK is in.-public final class PendingBilling: BillingRunning, @unchecked Sendable {- let gate: LiveGate<LiveServices>- public init(gate: LiveGate<LiveServices>) { self.gate = gate }-- public func status() async throws -> AppBillingStatus {- guard let b = await gate.wait().billing else { throw NotStarted(what: "Billing") }- return try await b.status()- }-}-/// This Mac's relay devices until the SDK is in.public final class PendingDevices: DevicesRunning, @unchecked Sendable {let gate: LiveGate<LiveServices>diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/SpacesBackend.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/SpacesBackend.swiftindex 5ff133fc05..f198be1517 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/SpacesBackend.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Models/SpacesBackend.swift@@ -82,14 +82,9 @@ public protocol SpacesBackend: AnyObject, Sendable {/// Free space where local Spaces are written and which images are/// pulled (`local().storage()`), when known.func localStorage() async -> LocalStorage?- /// Cua Cloud can be used (signed in or client credentials).- func cloudAvailable() async -> Bool/// macOS VMs running on this Mac now (Lume's, Spaces or not: Apple's/// license counts every one), when Lume says.func runningMacosVms() async -> Int?- /// This account's Cua Cloud rates, when known: the New Space estimate.- /// `nil` shows none (the live backend has no source for them).- func cloudPricing() async -> AppCloudPricing?/// The SDK's teleport handle and the Space handle, for "Teleport an app".func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)?/// The SDK's teleport handle, for drops (no Space needed).@@ -188,7 +183,6 @@ public extension SpacesBackend {func appIcons(id: String, requests: [SpaceAppIconRequest]) async -> [Data?] { requests.map { _ in nil } }func primaryDisplay(id: String) async -> AppStreamDisplay? { nil }func usage(id: String) async -> AppSpaceUsage? { nil }- func cloudPricing() async -> AppCloudPricing? { nil }func gpuChoices() async -> [AppGpuChoice]? { nil }func hosts() async -> [AppSpaceHost] { [] }func reportedHostname(id: String) -> String? { nil }@@ -512,12 +506,6 @@ public final class LiveSpacesBackend: SpacesBackend, @unchecked Sendable {/// How long a probe the New Space sheet waits for may take.static let probeSeconds: Double = 10- /// Bounded: the session read can wait on the credential vault.- public func cloudAvailable() async -> Bool {- let status = await withTimeout(seconds: Self.probeSeconds) { [cua] in try cua.auth().status().loggedIn }- return (try? status.get()) ?? false- }-/// From `lume serve` (`$LUME_API`, else its default address), bounded./// Its list reads every VM's disk, so it can take seconds on a busy Mac.public func runningMacosVms() async -> Int? {@@ -537,10 +525,6 @@ public final class LiveSpacesBackend: SpacesBackend, @unchecked Sendable {}.count}- /// No estimate: the rates came from the Cua Cloud API, which has ended,- /// and the app does not offer new cloud Spaces. New Space never waits on it.- public func cloudPricing() async -> AppCloudPricing? { nil }-public func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? {(cua.teleport(), try await cua.spaces().space(space: id))}@@ -764,7 +748,6 @@ extension AppSpaceOs {extension AppLocation {var word: String {switch self {- case .cloud: "cloud"case .local: "local"case .yours: "yours"case .host: "host"@@ -792,7 +775,6 @@ extension AppRuntime {case .runc: return "runc"case .qemu: return "qemu"case .lume: return "lume"- case .kubevirt: return "kubevirt"case .other(let name): return name}}@@ -874,7 +856,7 @@ public final class FixtureSpacesBackend: SpacesBackend, @unchecked Sendable {imageDigest: "sha256:4f1c2a9d8e7b6c5a4f3e2d1c0b9a8f7e6d5c4b3a2f1e0d9c8b7a6f5e4d3c2b1a",kind: .container, arch: "arm64", reachable: true, error: nil, host: nil, hostName: nil,power: "suspend", powerState: "running", cloud: nil, cloudPlace: nil, cloudDelete: nil, stopReason: nil),- AppSpaceRow(id: "cloud:builder", name: "builder", provider: "cloud", spacesdVersion: "0.4.0",+ AppSpaceRow(id: "direct:builder", name: "builder", provider: "direct", spacesdVersion: "0.4.0",features: ["desktop_stream"], addedAt: "2026-09-24T08:00:00Z",os: .linux, osName: "Arch Linux", osPrettyName: nil, image: nil, imageDigest: nil,kind: nil, arch: nil, reachable: false, error: "timed out", host: nil, hostName: nil,@@ -1104,15 +1086,9 @@ public final class FixtureSpacesBackend: SpacesBackend, @unchecked Sendable {/// shows no room lines).public var fixtureStorage: LocalStorage?public func localStorage() async -> LocalStorage? { await MainActor.run { fixtureStorage } }- /// Signed in to Cua Cloud (off: the fixture account is local only).- public var fixtureCloud = false- public func cloudAvailable() async -> Bool { await MainActor.run { fixtureCloud } }/// macOS VMs running on the fixture Mac outside its Spaces (none known).public var fixtureMacosVms: Int?public func runningMacosVms() async -> Int? { await MainActor.run { fixtureMacosVms } }- /// The fixture account's Cua Cloud rates (none: no estimate).- public var fixturePricing: AppCloudPricing?- public func cloudPricing() async -> AppCloudPricing? { await MainActor.run { fixturePricing } }public func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? { nil }public func teleportHandle() -> CuaSpacesFFI.Teleport? { nil }/// Run records (`agent_list` JSON), per Space id.diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Resources/Localizable.xcstrings b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Resources/Localizable.xcstringsindex 6b6c54ff07..4dc703340c 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Resources/Localizable.xcstrings+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Resources/Localizable.xcstrings@@ -100,17 +100,6 @@}}},- "spaces.sidebar.section.cloud": {- "extractionState": "manual",- "localizations": {- "en": {- "stringUnit": {- "state": "translated",- "value": "Cua Cloud"- }- }- }- },"spaces.sidebar.section.this_mac": {"extractionState": "manual","localizations": {diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/NewSpaceWizardView.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/NewSpaceWizardView.swiftindex 976a918ab0..4d9a3b2636 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/NewSpaceWizardView.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/NewSpaceWizardView.swift@@ -462,7 +462,6 @@ public struct NewSpaceWizardView: View {case "runc": return .runccase "qemu": return .qemucase "lume": return .lume- case "kubevirt": return .kubevirt// An external runtime provider's name.case "", "auto": return .autodefault: return .other(word)diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/SpaceDetailView.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/SpaceDetailView.swiftindex 5c456be948..60882fc5b1 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/SpaceDetailView.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/Views/SpaceDetailView.swift@@ -179,36 +179,22 @@ struct SpaceDetailView: View {}@ViewBuilder private func preview(_ detail: AppSpaceDetail) -> some View {- if let notice = detail.creditNotice, !detail.canStream {+ StreamPhaseReader(session: detail.canStream ? session : nil) { phase in+ let cover = model.cover(detail, requested: connectRequested, stream: session == nil ? providerPhase : phase)ZStack {- Rectangle().fill(.quaternary)- // Out of Cua Cloud credit: one line and Add credit (the- // website billing page). Local Spaces never see this.- HStack(spacing: 12) {- Text(notice.text).foregroundStyle(.secondary)- Button(notice.button) { model.openBillingPage(notice.url) }- .buttonStyle(.borderedProminent)- .accessibilityIdentifier("add-credit")+ if let session, detail.canStream {+ SpaceScreenView(session: session, isInteractive: true, showsControls: false)}- }- } else {- StreamPhaseReader(session: detail.canStream ? session : nil) { phase in- let cover = model.cover(detail, requested: connectRequested, stream: session == nil ? providerPhase : phase)- ZStack {- if let session, detail.canStream {- SpaceScreenView(session: session, isInteractive: true, showsControls: false)- }- if cover.kind != .stream {- DesktopCoverView(cover: cover, image: model.thumbnails[space.id],- progress: detail.progress, progressText: detail.progressText,- onAction: { model.devices.startEnroll(in: .main) }) {- press(cover)- }- .transition(.opacity)+ if cover.kind != .stream {+ DesktopCoverView(cover: cover, image: model.thumbnails[space.id],+ progress: detail.progress, progressText: detail.progressText,+ onAction: { model.devices.startEnroll(in: .main) }) {+ press(cover)}+ .transition(.opacity)}- .animation(.easeOut(duration: 0.25), value: cover.kind)}+ .animation(.easeOut(duration: 0.25), value: cover.kind)}}diff --git a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swiftindex dcc7f96da2..63aa80e6ee 100644--- a/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift+++ b/apps/cua-spaces-macos/Sources/CuaSpacesMacKit/WebHost/WebUIBridge.swift@@ -578,9 +578,9 @@ final class WebUIBridge: NSObject, WKScriptMessageHandlerWithReply {/// `spaces.createOptions`: the env the native New Space sheet opens/// with (`AppModel.newSpaceEnv`: this Mac's runtimes, storage and GPUs,- /// your machines that provide Spaces, your clouds, pricing), which the+ /// your machines that provide Spaces, your clouds), which the/// page's wizard runs on as it is, in the shape of the web bridge's- /// `NewSpaceOptions` (`local`, `gpus` and `cloudPricing` from the same+ /// `NewSpaceOptions` (`local` and `gpus` from the same/// env, for readers that don't take `env`), and the macOS VMs running/// on this Mac (`macosVmsRunning`: Apple's limit of two counts every/// one, Spaces or not).@@ -608,7 +608,6 @@ final class WebUIBridge: NSObject, WKScriptMessageHandlerWithReply {"storage": BridgeValue.encode(env.storage),] as [String: Any],"gpus": BridgeValue.encode(env.gpus),- "cloudPricing": BridgeValue.encode(env.cloudPricing),"experiments": BridgeValue.encode(env.experiments),"maxCpus": NSNumber(value: env.maxCpus),"env": BridgeValue.encode(env),@@ -682,8 +681,7 @@ final class WebUIBridge: NSObject, WKScriptMessageHandlerWithReply {case "runc": runtime = .runccase "qemu": runtime = .qemucase "lume": runtime = .lume- case "kubevirt": runtime = .kubevirt- default: throw Failure.badArgs("config.runtime: auto | gvisor | runc | qemu | lume | kubevirt")+ default: throw Failure.badArgs("config.runtime: auto | gvisor | runc | qemu | lume")}func count(_ key: String) -> UInt32? { (c[key] as? NSNumber).map { $0.uint32Value } }let text = { (key: String) in (c[key] as? String).flatMap { $0.isEmpty ? nil : $0 } }diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/AgentsPagesTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/AgentsPagesTests.swiftindex 893b6a630d..7b8e48d601 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/AgentsPagesTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/AgentsPagesTests.swift@@ -34,7 +34,7 @@ final class FakeAgentsTools: AgentsToolRunning, @unchecked Sendable {case "persistent_agent_list":return ["agents": [["name": "ada", "harness": "hermes", "space": "local:dev", "paused": paused, "run_id": paused ? NSNull() : "run-1", "saved_ms": now - 120_000],- ["name": "scout", "harness": "claude-code", "space": "cloud:scout", "paused": true, "space_state": "released", "saved_ms": now - 7_200_000],+ ["name": "scout", "harness": "claude-code", "space": "direct:scout", "paused": true, "space_state": "released", "saved_ms": now - 7_200_000],]]case "agent_pause": paused = true; return [:]case "volume_ls":diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/BridgeContractTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/BridgeContractTests.swiftindex 6db2a3acca..f5e6ad359d 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/BridgeContractTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/BridgeContractTests.swift@@ -152,9 +152,7 @@ struct BridgeContractTests {func linuxSource() async -> String? { await inner.linuxSource() }func setLinuxSource(_ value: String) async throws { try await inner.setLinuxSource(value) }func localStorage() async -> LocalStorage? { await inner.localStorage() }- func cloudAvailable() async -> Bool { await inner.cloudAvailable() }func runningMacosVms() async -> Int? { await inner.runningMacosVms() }- func cloudPricing() async -> AppCloudPricing? { await inner.cloudPricing() }func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? {try await inner.teleportContext(id: id)}@@ -192,7 +190,7 @@ struct BridgeContractTests {settingsPath: dir.appendingPathComponent("settings.json").path,host: FixtureHost(), account: FixtureAccount(identity: "[email protected]"),telemetry: FixtureTelemetry(), agentSetup: FixtureAgentSetup(),- billing: FixtureBilling(), devices: FixtureDevices(), presence: FixturePresence(),+ devices: FixtureDevices(), presence: FixturePresence(),loginItem: FixtureLoginItem(.enabled), startup: startup)model.updates = UpdatesModel(updater: FixtureUpdater(lastCheck: fixtureNow), channel: .stable)await model.refresh()@@ -428,7 +426,7 @@ struct BridgeContractTests {let ready = try Self.json(WebUIBridge.createOptions(env: await model.newSpaceEnv(), macosVmsRunning: 1, pending: false))#expect(JSONShape.validate(schema, ready, defs: defs) == [])// Such an answer fails.- let broken: [String: Any] = ["local": NSNull(), "gpus": NSNull(), "cloudPricing": NSNull(), "experiments": [:], "maxCpus": 8]+ let broken: [String: Any] = ["local": NSNull(), "gpus": NSNull(), "experiments": [:], "maxCpus": 8]#expect(JSONShape.validate(schema, broken, defs: defs).sorted() == ["$.env: missing", "$.local: expected object, got null"])}diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/CreateOptionsTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/CreateOptionsTests.swiftindex 18602da78f..1d4ae64244 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/CreateOptionsTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/CreateOptionsTests.swift@@ -50,7 +50,7 @@ struct CreateOptionsTests {@Test func theAnswerHasTheShapeThePageReads() async throws {let (bridge, model) = bridge(liveMac())let options = try json(try await bridge.handle("spaces.createOptions", [:]))- #expect(Set(options.keys) == ["local", "gpus", "cloudPricing", "experiments", "maxCpus", "env", "macosVmsRunning"])+ #expect(Set(options.keys) == ["local", "gpus", "experiments", "maxCpus", "env", "macosVmsRunning"])#expect(options["pending"] == nil)#expect(options["macosVmsRunning"] as? Int == 2)// The env the core takes, unchanged.diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DetailApprovalTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DetailApprovalTests.swiftindex 1364f29dc5..9cf2c3c397 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DetailApprovalTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DetailApprovalTests.swift@@ -37,7 +37,6 @@ private final class ApprovalBackend: SpacesBackend, @unchecked Sendable {}func localBackends() async -> [String]? { nil }func localStorage() async -> LocalStorage? { nil }- func cloudAvailable() async -> Bool { false }func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? { nil }func teleportHandle() -> CuaSpacesFFI.Teleport? { nil }func sendFiles(id: String, paths: [String]) async throws -> [AppSentFileInfo] { [] }diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DiscoveryTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DiscoveryTests.swiftindex 111c9c8459..21e2534287 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DiscoveryTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/DiscoveryTests.swift@@ -24,7 +24,6 @@ private final class DiscoveryBackend: SpacesBackend, @unchecked Sendable {}func localBackends() async -> [String]? { nil }func localStorage() async -> LocalStorage? { nil }- func cloudAvailable() async -> Bool { false }func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? { nil }func teleportHandle() -> CuaSpacesFFI.Teleport? { nil }func sendFiles(id: String, paths: [String]) async throws -> [AppSentFileInfo] { [] }@@ -62,7 +61,7 @@ struct DiscoveryTests {#expect(model.rosterError == "Could not refresh Spaces. Previously loaded rows may be out of date.")backend.result = .success([])await model.refresh()- #expect(!model.spaces.contains { $0.id == "local:aurora" || $0.id == "cloud:builder" })+ #expect(!model.spaces.contains { $0.id == "local:aurora" || $0.id == "direct:builder" })#expect(model.rosterError == nil)}diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LaunchPaintTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LaunchPaintTests.swiftindex 0024ab41e8..888e5b4615 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LaunchPaintTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/LaunchPaintTests.swift@@ -41,7 +41,7 @@ import WebKitsettingsPath: dir.appendingPathComponent("settings.json").path,host: PendingHost(gate: gate), account: PendingAccount(gate: gate),telemetry: FixtureTelemetry(), agentSetup: PendingAgentSetup(gate: gate),- billing: PendingBilling(gate: gate), devices: PendingDevices(gate: gate),+ devices: PendingDevices(gate: gate),presence: FixturePresence(), loginItem: FixtureLoginItem(.enabled), startup: startup)return (model, gate)}diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/NotchTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/NotchTests.swiftindex 6970df5ad6..4e3ce75b69 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/NotchTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/NotchTests.swift@@ -60,7 +60,7 @@ struct NotchTests {/// The debug start's highlight names one control.@Test func highlightParses() {#expect(NotchHighlight.parse("tile", firstTile: "local:aurora") == NotchHighlight(.tile("local:aurora")))- #expect(NotchHighlight.parse("tile=cloud:x:pressed", firstTile: nil) == NotchHighlight(.tile("cloud:x"), pressed: true))+ #expect(NotchHighlight.parse("tile=direct:x:pressed", firstTile: nil) == NotchHighlight(.tile("direct:x"), pressed: true))#expect(NotchHighlight.parse("settings:pressed", firstTile: nil) == NotchHighlight(.button(.settings), pressed: true))#expect(NotchHighlight.parse("list", firstTile: nil) == NotchHighlight(.button(.list)))#expect(NotchHighlight.parse("search", firstTile: nil) == NotchHighlight(.search))diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swiftindex 7f140e9fbd..2a9f965caa 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ParityTests.swift@@ -137,7 +137,6 @@ struct ParityTests {func location(_ w: String) -> AppLocation {switch w {- case "cloud": .cloudcase "yours": .yourscase "host": .hostcase "auto": .auto@@ -321,7 +320,6 @@ struct ParityTests {/// A flow's provider word (a create on another machine is `relay`).func provider(_ word: String) -> AppSpaceProvider {switch word {- case "cloud": return .cloudcase "relay": return .relaycase "direct": return .directdefault: return .local@@ -386,7 +384,6 @@ struct ParityTests {"progress": d.progress.map { Int($0) as Any } ?? NSNull(), "canStream": d.canStream,"progressText": opt(d.progressText),"actions": d.actions.map { "\($0.label)\($0.enabled ? "" : " (off)")" },- "creditNotice": d.creditNotice.map { "\($0.text) [\($0.button) -> \($0.url)]" } as Any? ?? NSNull(),]// Why turning it off or on failed, when it did.if let e = d.powerError { detail["powerError"] = e }@@ -1873,7 +1870,7 @@ struct ParityTests {func os(_ w: String) -> AppSpaceOs { w == "macos" ? .macos : w == "windows" ? .windows : .linux }func runtime(_ w: String) -> AppRuntime {- [.auto, .gvisor, .runc, .qemu, .lume, .kubevirt].first { word($0) == w } ?? (w.isEmpty ? .auto : .other(w))+ [.auto, .gvisor, .runc, .qemu, .lume].first { word($0) == w } ?? (w.isEmpty ? .auto : .other(w))}func move(_ w: String) -> AppTeleportMove {[.appOnly, .appWithFiles, .appWithState].first { word($0) == w }!@@ -1881,7 +1878,14 @@ struct ParityTests {func runPhase(_ w: String) -> AppTeleportRunPhase {[.started, .progress, .finished, .failed, .done].first { word($0) == w }!}- func word(_ v: AppLocation) -> String { v == .cloud ? "cloud" : "local" }+ func word(_ v: AppLocation) -> String {+ switch v {+ case .local: "local"+ case .yours: "yours"+ case .host: "host"+ case .auto: "auto"+ }+ }func word(_ v: AppRuntime) -> String {switch v {case .auto: "auto"@@ -1889,7 +1893,6 @@ struct ParityTests {case .runc: "runc"case .qemu: "qemu"case .lume: "lume"- case .kubevirt: "kubevirt"case .other(let name): name}}@@ -1898,7 +1901,7 @@ struct ParityTests {case .ambient: "ambient"case .ambientTeleport: "ambient-teleport"case .switcher: "switcher"- case .createFleet: "create-fleet"+ case .createSpace: "create-space"}}func word(_ v: AppPickerStep) -> String { "\(v)" }@@ -2382,7 +2385,7 @@ struct ParityTests {}for step in f["settings"] as! [[String: Any]] {let input = try appSettingsInputFromJson(json: text([- "signIn": ["kind": "idle"], "canSignOut": false, "menuBar": false, "defaultLocation": "local",+ "signIn": ["kind": "idle"], "canSignOut": false, "menuBar": false,"agentsBusy": false, "agentsPending": [], "loginItem": step["loginItem"] as Any,] as [String: Any]))let general = appSettingsPage(input: input).sections.filter { $0.id == "general" }.flatMap(\.rows)diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ProviderFailureTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ProviderFailureTests.swiftindex 3907908244..cb7e0ec716 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ProviderFailureTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ProviderFailureTests.swift@@ -32,7 +32,6 @@ private final class ProviderFailureBackend: SpacesBackend, @unchecked Sendable {}func localBackends() async -> [String]? { nil }func localStorage() async -> LocalStorage? { nil }- func cloudAvailable() async -> Bool { false }func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? { nil }func teleportHandle() -> CuaSpacesFFI.Teleport? { nil }func sendFiles(id: String, paths: [String]) async throws -> [AppSentFileInfo] { [] }diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swiftindex 8abf41a21e..7603f202b6 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/SnapshotTests.swift@@ -262,7 +262,7 @@ struct SnapshotTests {/// "Signed in" beside the Space a Keyvault sign-in is live in.@Test func mainWindowSidebarSignedIn() async throws {let m = try await model(overview: try signedInOverview())- m.select("cloud:builder")+ m.select("direct:builder")try assertSnapshot(Sidebar(model: m).frame(width: 260), "sidebar-signed-in", size: CGSize(width: 260, height: 520))}@@ -608,7 +608,7 @@ struct SnapshotTests {@Test func notchActivityProvisioning() async throws {try await assertNotch("notch-activity-provisioning") { n invar s = n.spaces.first { $0.id != "this-mac" }!- s.id = "cloud:starter"+ s.id = "direct:starter"s.name = "Starter"s.status = .provisionings.startedAt = Int64(Date().timeIntervalSince1970 * 1000) - 40_000diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/StalePollTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/StalePollTests.swiftindex 37d47c312e..58dfbf3fde 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/StalePollTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/StalePollTests.swift@@ -95,7 +95,6 @@ import Testingfunc streamProvider(id: String) async throws -> SpaceStreamSourceProviding { try await inner.streamProvider(id: id) }func localBackends() async -> [String]? { ["docker"] }func localStorage() async -> LocalStorage? { nil }- func cloudAvailable() async -> Bool { false }func teleportContext(id: String) async throws -> (CuaSpacesFFI.Teleport, CuaSDK.Space)? { nil }func teleportHandle() -> CuaSpacesFFI.Teleport? { nil }func sendFiles(id: String, paths: [String]) async throws -> [AppSentFileInfo] { [] }diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swiftindex c33e3999f3..292d7cd2b6 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/ViewModelTests.swift@@ -135,7 +135,7 @@ let fixtureNow = Date(timeIntervalSince1970: 1_800_000_000)struct ViewModelTests {func makeModel(_ backend: SpacesBackend = FixtureSpacesBackend(), kv: KeyvaultClientProtocol? = nil,host: HostRunning? = nil, account: AccountRunning? = nil,- agents: AgentSetupRunning? = nil, billing: BillingRunning? = nil,+ agents: AgentSetupRunning? = nil,loginItem: LoginItemControlling? = nil, telemetry: TelemetryRunning = FixtureTelemetry()) -> AppModel {let dir = FileManager.default.temporaryDirectory.appendingPathComponent("cua-mac-tests-\(UUID().uuidString)")return AppModel(backend: backend,@@ -143,7 +143,7 @@ struct ViewModelTests {onboarding: OnboardingModel(statePath: dir.appendingPathComponent("onboarding.json").path),settingsPath: dir.appendingPathComponent("settings.json").path,host: host, account: account, telemetry: telemetry, agentSetup: agents,- billing: billing, loginItem: loginItem)+ loginItem: loginItem)}@Test func liveKeyvaultSharingShowsInTheNotchAndTheMenu() async throws {@@ -695,13 +695,13 @@ struct ViewModelTests {let model = makeModel()await model.refresh()let titles = model.sidebar.sections.map(\.title.code)- #expect(titles == ["spaces.sidebar.section.cloud", "spaces.sidebar.section.this_mac", "spaces.sidebar.section.connected"])+ #expect(titles == ["spaces.sidebar.section.this_mac", "spaces.sidebar.section.connected"])// The container hostname defers to the name in the id.#expect(model.spaces.contains { $0.name == "aurora" })// An unreachable Space is dimmed and cannot stream.- let builder = model.spaces.first { $0.id == "cloud:builder" }!+ let builder = model.spaces.first { $0.id == "direct:builder" }!#expect(model.detail(builder).canStream == false)- #expect(model.sidebar.sections[0].rows[0].dim)+ #expect(model.sidebar.sections.flatMap(\.rows).first { $0.id == builder.id }?.dim == true)}@Test func searchFiltersThroughTheCore() async {@@ -776,20 +776,17 @@ struct ViewModelTests {}/// Run on lists this Mac only while no cloud is connected (and with Your- /// cloud turned off, no cloud at all); Cua Cloud is never offered, and- /// New Space creates on this Mac. Your cloud is on by default, so- /// "Connect a cloud" is there until it is turned off.+ /// 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.@Test func runOnIsThisMacUntilACloudIsConnected() async {let backend = FixtureSpacesBackend()- backend.fixtureCloud = true- backend.fixturePricing = AppCloudPricing(vcpuHourUsd: 0.044625, memoryGibHourUsd: 0.0223125)let model = makeModel(backend)await model.openNewSpace()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")- w.send(.setPlacement(placement: .cloud))w.send(.setPlacement(placement: .yours))#expect(w.view.plan.placement == .local)w.send(.next)@@ -1241,7 +1238,7 @@ struct ViewModelTests {let model = makeModel(backend)await model.refresh()let row = { (id: String) in model.sidebar.sections.flatMap(\.rows).first { $0.id == id } }- #expect(row("cloud:builder")?.power == nil, "a cloud Space cannot be turned off")+ #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.@@ -1536,15 +1533,13 @@ struct ViewModelTests {#expect(model.gate?.action.label == "See Teams")}- /// Settings hides Cua Cloud billing and shows the real Teams section+ /// Settings shows the real Teams section/// (the Spaces API: name with alias fallback, members, pending invites- /// marked "(Invited)", the account app for invites and billing); a cloud- /// create refused for want of credit shows one line and no Add credit.- @Test func billingIsHiddenAndTeamsComeFromTheSpacesAPI() async throws {+ /// marked "(Invited)", the account app for invites and billing).+ @Test func teamsComeFromTheSpacesAPI() async throws {var opened: [URL] = []BillingBrowser.open = { opened.append($0) }- let model = makeModel(account: FixtureAccount(identity: "[email protected]"),- billing: FixtureBilling(balanceCents: 742))+ let model = makeModel(account: FixtureAccount(identity: "[email protected]"))model.teamsReader = FixtureTeams([AppTeamInput(id: "o1", alias: "acme", name: "", role: "owner", plan: "teams", seats: 3,members: [AppTeamPersonInput(email: "[email protected]", role: "owner"),@@ -1565,16 +1560,6 @@ struct ViewModelTests {await model.press(row: "teams-billing")#expect(opened.map(\.absoluteString) == ["https://app.cua.ai/team", "https://app.cua.ai/billing"])- var creates = appCreatesReduce(state: AppCreatesState(pending: [], deleting: [], powering: [], streaks: []),- action: .start(id: "pending:1", name: "cloud", os: .linux, provider: .cloud,- now: 0, image: nil, kind: nil, hostArch: nil, gpu: false,- host: nil, hostName: nil))- creates = appCreatesReduce(state: creates, action: .fail(- id: "pending:1", error: "You're out of Cua Cloud credit. Add credit at https://app.cua.ai/billing",- errorVariant: "", now: nil))- let space = appCreatesCompose(spaces: [], state: creates)[0]- #expect(space.detail == "You're out of Cua Cloud credit.")- #expect(appSpaceDetail(space: space).creditNotice == nil)}}diff --git a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WindowDropTests.swift b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WindowDropTests.swiftindex 15622478c9..09340b61e6 100644--- a/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WindowDropTests.swift+++ b/apps/cua-spaces-macos/Tests/CuaSpacesMacTests/WindowDropTests.swift@@ -22,9 +22,9 @@ struct WindowDropTests {@Test func onlyDropTargetRowsHitAndARowReleaseCommits() {let targets = SidebarDropTargets()- targets.isDropTarget = { $0 != "cloud:builder" }+ targets.isDropTarget = { $0 != "direct:builder" }targets.setFrame("local:aurora", CGRect(x: 10, y: 60, width: 200, height: 24))- targets.setFrame("cloud:builder", CGRect(x: 10, y: 90, width: 200, height: 24))+ targets.setFrame("direct:builder", CGRect(x: 10, y: 90, width: 200, height: 24))#expect(targets.row(atContent: CGPoint(x: 50, y: 70)) == "local:aurora")#expect(targets.row(atContent: CGPoint(x: 50, y: 100)) == nil, "not a drop target")#expect(targets.row(atContent: CGPoint(x: 400, y: 70)) == nil)@@ -44,7 +44,7 @@ struct WindowDropTests {let model = ViewModelTests().makeModel()await model.refresh()#expect(model.dropTargets.isDropTarget("local:aurora"))- #expect(!model.dropTargets.isDropTarget("cloud:builder"), "unreachable")+ #expect(!model.dropTargets.isDropTarget("direct:builder"), "unreachable")#expect(!model.dropTargets.isDropTarget("no-such-space"))// The same answer as the notch tiles while they show.model.notch.send(.click)diff --git a/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift b/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swiftindex 55411054b2..5dbfb05ae8 100644--- a/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift+++ b/apps/cua-spaces-macos/UITests/CuaSpacesMacUITests.swift@@ -27,7 +27,6 @@ final class CuaSpacesMacUITests: XCTestCase {let app = launch()// Names show as typed (the core no longer title-cases them).XCTAssertTrue(app.staticTexts["aurora"].waitForExistence(timeout: 10))- XCTAssertTrue(app.staticTexts["Cua Cloud"].exists)XCTAssertTrue(app.staticTexts["Connected"].exists)XCTAssertTrue(app.staticTexts["All Items"].exists, "the Keyvault categories are in the sidebar")}diff --git a/apps/cua-spaces-web/src/bridge/README.md b/apps/cua-spaces-web/src/bridge/README.mdindex 694863f771..ff5acf0c2e 100644--- a/apps/cua-spaces-web/src/bridge/README.md+++ b/apps/cua-spaces-web/src/bridge/README.md@@ -36,7 +36,7 @@ import { BridgeProvider, useSpaces } from "@/bridge";| `useJoinWithCode({ onJoined? })` | "Join with a code": `{ phase, error, join(codeOrLink, relay?), reset() }`. `join` reads the code the way `cua host setup --pair` does (`pairing-code.ts`), then asks the host to run the bundled `cua host setup --pair` (`host.joinWithCode`). Opening the app with a `cua://add/<code>` link lands on `/machines?join=<code>`, which fills the dialog and waits for Join. || `useSettings()` | `{ values, telemetry, defaultLocation, page }`, where `page` is the core's Settings layout. Action: `updateSetting(key, value)` for `theme`, `menuBar`, `hotkey`, `telemetry`, `defaultLocation`, `launchAtLogin` or `updateChannel`. The last two are `null` when the host can't offer them, and the Settings page hides their rows. `globalShortcut` is the host's ⌘⇧Space (macOS) with whether the system gave it to the app; absent or `null` where the host has none. || `useKeyvault()` | `{ overview, groups, views, vaultState }`. `views` holds the core's `page`, `sidebar` and `vault` (the list grouped by app, then site). Actions: `unlock(passphrase?)`, `lockItem(id)`, `lockItems(ids)`, `unlockItems(ids)`, `setDisabled`, `approve`, `deny`, `revokeGrant`, `vaultAction(action)` (search, select, open), and `pane(selection)`. |-| `useSession()` | `{ fleet, onboarding, daemon, signedIn, identity, signIn }`, where `signIn` is the sign-in phase. Actions: `signIn()`, `signOut()`, `completeOnboarding(mode)`, `openExternal(url)`. |+| `useSession()` | `{ account, onboarding, daemon, signedIn, identity, signIn }`, where `signIn` is the sign-in phase. Actions: `signIn()`, `signOut()`, `completeOnboarding(mode)`, `openExternal(url)`. || `useAgents()` | `{ agents, runs, unread, canList }`: persistent agents (state `running`, `paused` or `idle`, the core's row line and action label, the run the detail opens) and the runs in every running Space, in the core's order. Actions: `pauseAgent(name)`, `resumeAgent(name)`, `agentSetup()`, `configureAgents(agents?)`. || `useAgentDetail(agent)` | A persistent agent's Memory, Routines and Access to this computer (`agent-detail.ts`): `{ view, busy, error, unsupported, thisMachine, act(action) }`. The page runs the core's `agents.pageReduce` / `agents.pageView`, as `PersistentModel` does natively, and the host runs each command (`ops/agent-detail.ts`). || `useAgentTimeline(run)` | One run's conversation while mounted: `{ items, status, phase, caughtUp, isLoading, error, unsupported, lastEventMs }`. It reads `agents.events` with a cursor (every 500 ms while a turn runs, 4 s otherwise) and folds the events like cua-agents' `Transcript` (`transcript.ts`). Items are immutable, so a row memoized by item re-renders only when its item changed. |@@ -99,7 +99,7 @@ Each is an existing Tauri command under a host-neutral name:| `keyvault.unlock` `{passphrase?}` | `keyvault_unlock` / `keyvault_unlock_passphrase` || `keyvault.setUnattended` `{itemIds, unattended}` | `keyvault_set_unattended` || `keyvault.setDisabled`, `.approve`, `.deny`, `.revokeGrant` | `keyvault_set_disabled`, `keyvault_approve`, `keyvault_deny`, `keyvault_revoke_grant` |-| `session.get` | `fleet_status` + `onboarding_state` + `daemon_status` |+| `session.get` | `account_status` + `onboarding_state` + `daemon_status` || `session.signIn` / `.signOut` / `.completeOnboarding` / `.openExternal` | `begin_sign_in` / `sign_out` / `complete_onboarding` / `open_external` || `agents.list` | `agents_tool` `persistent_agent_list` (snake_case mapped to `PersistentAgent`) || `agents.runs` `{spaceId}` | `list_space_agents` |@@ -164,7 +164,7 @@ speaks it as is:(camelCase records). `adapters/webkit.ts` maps each operation onto them andturns the results back into the wire shapes above, so the store derivesthe same way as for every other host. `AppSpace` becomes `SpaceRow`, the- Settings page rows (`notch`, `default-location`, `telemetry`) become+ Settings page rows (`notch`, `telemetry`) become`SettingsValues`, and the Keyvault overview becomes snake_case.- Events arrive as `window` `cua:event` CustomEvents (`detail: { event }`):`spaces.changed` (it also refreshes machines), `machines.changed` (this@@ -180,7 +180,7 @@ speaks it as is:- New Space is the page's wizard: `spaces.createOptions` answers the env thenative sheet opens with (`AppModel.newSpaceEnv`: this Mac's runtimes,storage and GPUs, your machines that provide Spaces, your clouds), carried- as `NewSpaceOptions.env` (with `local`, `gpus` and `cloudPricing` from it,+ as `NewSpaceOptions.env` (with `local` and `gpus` from it,and `macosVmsRunning`: the macOS VMs Lume runs on this Mac, which Apple'slimit of two counts). While the launch is still starting it answers atonce with what it knows and `pending: true`; the page asks again ondiff --git a/apps/cua-spaces-web/src/bridge/__tests__/contract.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/contract.test.tsindex 3212f78397..e8efa954b5 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/contract.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/contract.test.ts@@ -71,10 +71,10 @@ describe("bridge shapes", () => {it("says what is wrong, and where", () => {const s: Schema = OP_SHAPES["spaces.createOptions"];- expect(validate(s, { local: null, gpus: null, cloudPricing: null, experiments: {}, maxCpus: 8 }, SHAPE_DEFS)).toEqual([]);+ expect(validate(s, { local: null, gpus: null, experiments: {}, maxCpus: 8 }, SHAPE_DEFS)).toEqual([]);// An answer the wizard can't run on, against what the SwiftUI host must answer.const swift = WEBKIT_SHAPES["spaces.createOptions"]!;- expect(validate(swift, { local: null, gpus: null, cloudPricing: null, experiments: {}, maxCpus: 8 }, SHAPE_DEFS)).toEqual([+ expect(validate(swift, { local: null, gpus: null, experiments: {}, maxCpus: 8 }, SHAPE_DEFS)).toEqual(["$.env: missing","$.local: expected object, got null",]);@@ -82,7 +82,7 @@ describe("bridge shapes", () => {"$[0].spacesdVersion: missing","$[0].features: missing","$[0].reachable: missing",- '$[0].provider: "moon" is not one of "cloud", "local", "direct", "relay"',+ '$[0].provider: "moon" is not one of "local", "direct", "relay"',]);});});diff --git a/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/core.test.tsindex f403a6380f..c508c6807a 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/core.test.ts@@ -142,7 +142,7 @@ describe.skipIf(!wasmBuilt)("with the wasm core", () => {core,{ values: DEFAULT_SETTINGS, defaultLocation: null, telemetry: null },{- fleet: { configured: true, authMode: "user", baseUrl: "", tokenUrl: "", identity: "[email protected]" },+ account: { configured: true, authMode: "user", identity: "[email protected]" },onboarding: { completed: true },daemon: null,},@@ -236,7 +236,7 @@ describe.skipIf(!wasmBuilt)("with the wasm core", () => {["dev_lap", "Laptop", false, true],]);expect(machines[1]).toMatchObject({ detail: "macOS · Enrolled", lastSeen: 1791044974 });- const env = wizardEnv(core, { options: null, clouds: null, defaultLocation: "local", cloudAvailable: false, machines });+ const env = wizardEnv(core, { options: null, clouds: null, defaultLocation: "local", machines });expect(env.hosts?.map((h) => [h.id, h.online])).toEqual([["96fedb7e", true]]);});diff --git a/apps/cua-spaces-web/src/bridge/__tests__/demo-platform.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/demo-platform.test.tsindex cd658723f8..c8474dc19a 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/demo-platform.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/demo-platform.test.ts@@ -73,7 +73,6 @@ describe("the demo host on Windows and Linux", () => {const env = wizardEnv(core, {options: await a.call("spaces.createOptions", {}),defaultLocation: "local",- cloudAvailable: true,clouds: null,machines: (await a.call("machines.list", {})).map((m) => ({ ...m, current: Boolean(m.current) })),});diff --git a/apps/cua-spaces-web/src/bridge/__tests__/demo.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/demo.test.tsindex bd8294be2a..ed95fd61e1 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/demo.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/demo.test.ts@@ -90,7 +90,7 @@ describe("demo adapter", () => {const a = demo(demoOptionsFromSearch("?demo=fresh,locked"));expect((await a.call("keyvault.overview", {})).availability).toBe("locked");const s = await a.call("session.get", {});- expect(s.fleet.authMode).toBe("none");+ expect(s.account.authMode).toBe("none");expect(s.onboarding.completed).toBe(false);await a.call("keyvault.unlock", {});expect((await a.call("keyvault.overview", {})).availability).toBe("ready");@@ -108,6 +108,6 @@ describe("demo adapter", () => {expect((await a.call("session.signIn", {})).verificationUri).toMatch(/^https:/);await new Promise((r) => setTimeout(r, 30));expect(events).toContainEqual({ type: "session.signedIn", identity: "[email protected]" });- expect((await a.call("session.get", {})).fleet.identity).toBe("[email protected]");+ expect((await a.call("session.get", {})).account.identity).toBe("[email protected]");});});diff --git a/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/detail.test.tsindex ee167d96b1..3dbf0487dd 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/detail.test.ts@@ -34,7 +34,7 @@ describe("usage events", () => {{ type: "space-create-started", location: "local", guestOs: "linux", kind: "container", gpu: false },{ type: "space-create", location: "local", guestOs: "linux", kind: "vm", outcome: "ok", failedPhase: "none", stalled: false, elapsedMs: -1, gpu: false },{ type: "space-create", location: "local", guestOs: "linux", kind: "vm", outcome: "ready", failedPhase: "none", stalled: false, elapsedMs: 10, gpu: false },- { type: "space-create", location: "cloud", guestOs: "windows", kind: "vm", outcome: "error", failedPhase: "booting", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "InsufficientDisk" },+ { type: "space-create", location: "yours", guestOs: "windows", kind: "vm", outcome: "error", failedPhase: "booting", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "InsufficientDisk" },{ type: "space-create", location: "local", guestOs: "linux", kind: "vm", outcome: "error", failedPhase: "booting", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "need 52 GB" },{ type: "space-create", location: "local", guestOs: "linux", kind: "vm", outcome: "ok", failedPhase: "none", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "", retryAttempt: 1, errorSubclass: "runtime_start" },{ type: "space-create", location: "local", guestOs: "linux", kind: "vm", outcome: "ok", failedPhase: "none", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "", retryAttempt: 2, errorSubclass: "none" },@@ -45,7 +45,7 @@ describe("usage events", () => {).toEqual([{ type: "step", step: "app_launched", ok: true },{ type: "space-create-started", location: "local", guestOs: "linux", kind: "container", gpu: false },- { type: "space-create", location: "cloud", guestOs: "windows", kind: "vm", outcome: "error", failedPhase: "booting", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "InsufficientDisk" },+ { type: "space-create", location: "yours", guestOs: "windows", kind: "vm", outcome: "error", failedPhase: "booting", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "InsufficientDisk" },{ type: "space-create", location: "local", guestOs: "linux", kind: "vm", outcome: "ok", failedPhase: "none", stalled: false, elapsedMs: 10, gpu: false, errorVariant: "", retryAttempt: 1, errorSubclass: "runtime_start" },]);});diff --git a/apps/cua-spaces-web/src/bridge/__tests__/hosts.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/hosts.test.tsindex dfc2dc8c8f..ee24d06b30 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/hosts.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/hosts.test.ts@@ -107,7 +107,7 @@ describe("tauri adapter", () => {it("answers every operation", async () => {const app = { id: "slack", name: "Slack", capability: "full", moves: ["app_only"] };const { win } = tauriHost({- fleet_status: { configured: false, authMode: "none" },+ account_status: { configured: false, authMode: "none" },list_hosts: [],teleport_entry_for_path: app,teleport_plan: { app, space_id: "s", moves: "app_only", steps: [], consent: [], sensitive: false, total_bytes: 0, warnings: [] },@@ -187,7 +187,7 @@ describe("tauri adapter", () => {it("reads UI settings from the shell's storage and writes each key to its command", async () => {const { win, calls } = tauriHost({telemetry_status: { enabled: false, sourceKind: "config" },- get_default_location: { value: "cloud", source: "config", path: "x" },+ get_default_location: { value: "host:m2", source: "config", path: "x" },login_item_status: "requiresApproval",login_item_set: "notRegistered",});@@ -198,7 +198,7 @@ describe("tauri adapter", () => {menuBar: true,hotkey: "⌘⇧Space",telemetry: false,- defaultLocation: "cloud",+ defaultLocation: "host:m2",launchAtLogin: true,updateChannel: null,});@@ -275,7 +275,7 @@ describe("electron adapter", () => {const space = { id: "local:a", name: "A", os: "linux", status: "running", detail: "", lastUsedAt: 1 };const { win, invoke } = electronHost(bridged(() => ({ ok: true, result: { loaded: true, selectedId: null, spaces: [{ space, deleting: false }] } })));const rows = await createElectronAdapter(win).call("spaces.list", {});- expect(rows).toMatchObject([{ id: "local:a", name: "A", os: "linux", provider: "cloud" }]);+ expect(rows).toMatchObject([{ id: "local:a", name: "A", os: "linux", provider: "direct" }]);expect(invoke).toHaveBeenCalledWith(ELECTRON_BRIDGE_CHANNEL, expect.objectContaining({ method: "spaces.list", args: {} }));expect(createElectronAdapter(win).mode).toBe("electron");});@@ -429,7 +429,6 @@ const settingsPage = {id: "general",rows: [{ id: "notch", kind: "choice", label: "", enabled: true, options: [{ id: "show", label: "", active: false }, { id: "hide", label: "", active: true }] },- { id: "default-location", kind: "choice", label: "", enabled: false, help: "Set by CUA_ON", options: [{ id: "local", label: "", active: false }, { id: "cloud", label: "", active: true }] },],},{ id: "privacy", rows: [{ id: "telemetry", kind: "choice", label: "", enabled: true, options: [{ id: "on", label: "", active: false }, { id: "off", label: "", active: true }] }] },@@ -531,8 +530,8 @@ describe("webkit adapter", () => {it("reads settings from the core's page", async () => {const { win } = webkitHost(() => ok(settingsPage));const snap = await createWebkitAdapter(win).call("settings.get", {});- expect(snap.values).toMatchObject({ menuBar: true, telemetry: false, defaultLocation: "cloud", launchAtLogin: null, updateChannel: null });- expect(snap.defaultLocation).toMatchObject({ source: "env", env: "CUA_ON" });+ expect(snap.values).toMatchObject({ menuBar: true, telemetry: false, defaultLocation: "local", launchAtLogin: null, updateChannel: null });+ expect(snap.defaultLocation).toBeNull();});it("reads the global shortcut the host registered, and none from a host without one", async () => {@@ -575,7 +574,7 @@ describe("webkit adapter", () => {}),);const a = createWebkitAdapter(win);- expect((await a.call("session.get", {})).fleet).toMatchObject({ identity: "[email protected]", authMode: "user" });+ expect((await a.call("session.get", {})).account).toMatchObject({ identity: "[email protected]", authMode: "user" });// The first run is this page's on the SwiftUI host too (`onboarding.get`).expect((await a.call("session.get", {})).onboarding).toEqual({ completed: false, mode: "client" });const kv = await a.call("keyvault.overview", {});@@ -969,7 +968,7 @@ describe("webkit adapter", () => {it("runs New Space on the app's env and create, with its progress", async () => {vi.useFakeTimers();try {- const env = { defaultLocation: "local", cloudAvailable: true, localAvailable: true, maxCpus: 8, hosts: [{ id: "m1", name: "gamma-4 Mac Studio", via: "relay", online: true, os: "macos", limits: [] }] };+ const env = { defaultLocation: "local", localAvailable: true, maxCpus: 8, hosts: [{ id: "m1", name: "gamma-4 Mac Studio", via: "relay", online: true, os: "macos", limits: [] }] };const created = { ...wkSpace, id: "relay:m1/sandbox-1", name: "Sandbox 1", status: "running" };let finish: (a: Answer) => void = () => {};const { win, sent, emit } = webkitHost((req) => {diff --git a/apps/cua-spaces-web/src/bridge/__tests__/new-space.test.tsx b/apps/cua-spaces-web/src/bridge/__tests__/new-space.test.tsxindex d94c32b50c..cbefe7271d 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/new-space.test.tsx+++ b/apps/cua-spaces-web/src/bridge/__tests__/new-space.test.tsx@@ -62,12 +62,12 @@ describe.skipIf(!wasmBuilt)("New Space (wasm core)", () => {{ id: "this-mac", name: "This Mac", via: "local", online: true, os: "macos", current: true, limits: [] },{ id: "mac-mini", name: "Mac mini", via: "relay", online: true, os: "macos", current: false, limits: [] },];- const env = wizardEnv(core, { options: DEMO_NEW_SPACE_OPTIONS, clouds: null, defaultLocation: "host:mac-mini", cloudAvailable: true, machines });- expect(env).toMatchObject({ defaultLocation: "host", cloudAvailable: true, localAvailable: true, localBackends: ["docker", "lume"], maxCpus: 10, hostArch: "arm64" });+ const env = wizardEnv(core, { options: DEMO_NEW_SPACE_OPTIONS, clouds: null, defaultLocation: "host:mac-mini", machines });+ expect(env).toMatchObject({ defaultLocation: "host", localAvailable: true, localBackends: ["docker", "lume"], maxCpus: 10, hostArch: "arm64" });expect(env.hosts!.map((h) => h.id)).toEqual(["mac-mini"]);expect(env.clouds).toEqual([]);- const none = wizardEnv(core, { options: { ...DEMO_NEW_SPACE_OPTIONS, local: { available: false, backends: [], error: "no runtime", macosImage: null } }, clouds: null, defaultLocation: "local", cloudAvailable: false, machines: [] });+ const none = wizardEnv(core, { options: { ...DEMO_NEW_SPACE_OPTIONS, local: { available: false, backends: [], error: "no runtime", macosImage: null } }, clouds: null, defaultLocation: "local", machines: [] });expect(none).toMatchObject({ localAvailable: false, localReason: "no runtime" });});@@ -79,7 +79,7 @@ describe.skipIf(!wasmBuilt)("New Space (wasm core)", () => {expect(connectedClouds(core, status).map((c) => [c.name, c.label])).toEqual([["aws", "AWS · us-west-2"]]);const settings = await adapter.call("settings.get", {});expect(settings.values.defaultLocation).toBe("aws");- const env = wizardEnv(core, { options: DEMO_NEW_SPACE_OPTIONS, clouds: status, defaultLocation: "aws", cloudAvailable: true, machines: [] });+ const env = wizardEnv(core, { options: DEMO_NEW_SPACE_OPTIONS, clouds: status, defaultLocation: "aws", machines: [] });expect(env.defaultLocation).toBe("yours");adapter.dispose?.();});@@ -220,7 +220,7 @@ describe.skipIf(!wasmBuilt)("New Space (wasm core)", () => {describe.skipIf(!wasmBuilt)("First Space in one click (wasm core)", () => {const env = (core: CoreClient, options = DEMO_NEW_SPACE_OPTIONS) =>- wizardEnv(core, { options, clouds: null, defaultLocation: "cloud", cloudAvailable: true, machines: [] });+ wizardEnv(core, { options, clouds: null, defaultLocation: "local", machines: [] });it("offers Linux first with its size and time, then macOS with its real download", async () => {const core = await testCore();@@ -283,7 +283,7 @@ describe.skipIf(!wasmBuilt)("First Space in one click (wasm core)", () => {describe.skipIf(!wasmBuilt)("On the SwiftUI host's answer (wasm core)", () => {const env = (core: CoreClient, options = demoMacHostOptions("local", 2, false)) =>- wizardEnv(core, { options, clouds: null, defaultLocation: "cloud", cloudAvailable: true, machines: [] });+ wizardEnv(core, { options, clouds: null, defaultLocation: "local", machines: [] });it("offers both first Spaces, and the Resources step says what is free", async () => {const core = await testCore();diff --git a/apps/cua-spaces-web/src/bridge/__tests__/sharing.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/sharing.test.tsindex 05ab34765b..83d06d6738 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/sharing.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/sharing.test.ts@@ -55,7 +55,7 @@ describe.skipIf(!wasmBuilt)("the Machines page and New Space's Run on (wasm coreit("read one online signal, and say the same thing about a machine that stopped sharing", async () => {const core = await testCore();const machines = toMachines(rows, [], core, NOW);- const env = wizardEnv(core, { options: null, clouds: null, defaultLocation: "local", cloudAvailable: false, machines });+ const env = wizardEnv(core, { options: null, clouds: null, defaultLocation: "local", machines });const view = wizardView(core, wizardInitial(core, env), env);const runOn = new Map(view.placements.map((p) => [p.id.replace(/^host:/, ""), p] as const));@@ -84,13 +84,12 @@ describe.skipIf(!wasmBuilt)("the Machines page and New Space's Run on (wasm core...DEMO_NEW_SPACE_OPTIONS,env: {defaultLocation: "local" as const,- cloudAvailable: false,localAvailable: true,maxCpus: 8,hosts: [{ id: "gamma", name: "gamma-4 Mac Studio", via: "relay", online: true, os: "macos", limits: [{ resource: "sharing", used: 0, limit: 0, reason: LINE }] }],},};- const env = wizardEnv(core, { options, clouds: null, defaultLocation: "local", cloudAvailable: false, machines: [] });+ const env = wizardEnv(core, { options, clouds: null, defaultLocation: "local", machines: [] });const gamma = wizardView(core, wizardInitial(core, env), env).placements.find((p) => p.id === "host:gamma");expect(gamma).toMatchObject({ id: "host:gamma", label: "gamma-4 Mac Studio (not sharing)", enabled: false, detail: `${LINE}.` });});diff --git a/apps/cua-spaces-web/src/bridge/__tests__/signin.test.ts b/apps/cua-spaces-web/src/bridge/__tests__/signin.test.tsindex 9b77f05cf0..e6f3df2917 100644--- a/apps/cua-spaces-web/src/bridge/__tests__/signin.test.ts+++ b/apps/cua-spaces-web/src/bridge/__tests__/signin.test.ts@@ -81,9 +81,9 @@ function nativeHost() {// What the host says now; it answers after `getDelay`.const failure = host.failure;if (host.getDelay) await new Promise((r) => setTimeout(r, host.getDelay));- const fleet = out.fleet as Record<string, unknown>;+ const account = out.account as Record<string, unknown>;return host.identity- ? { ...out, fleet: { ...fleet, configured: true, authMode: "user", identity: host.identity }, hostSignIn: null }+ ? { ...out, account: { ...account, configured: true, authMode: "user", identity: host.identity }, hostSignIn: null }: failure? { ...out, hostSignIn: null, hostSignInFailure: failure }: { ...out, hostSignIn: { userCode: null, url: `http://127.0.0.1:${50000 + host.attempts}/callback` } };diff --git a/apps/cua-spaces-web/src/bridge/adapters/demo.ts b/apps/cua-spaces-web/src/bridge/adapters/demo.tsindex bbbe55d4d6..5a8ac6da7a 100644--- a/apps/cua-spaces-web/src/bridge/adapters/demo.ts+++ b/apps/cua-spaces-web/src/bridge/adapters/demo.ts@@ -295,13 +295,10 @@ export function createDemoAdapter(options: DemoOptions = {}): DataAdapter & { rereturn withDemoCopies(o, state, now());};const session = (): SessionSnapshot => ({- fleet: {+ account: {configured: Boolean(state.identity),authMode: state.identity ? "user" : "none",- baseUrl: "https://api.cua.ai",- tokenUrl: "https://auth.cua.ai/oauth/token",identity: state.identity,- namespaces: state.identity ? ["ada"] : [],},onboarding: { ...state.onboarding },daemon: { connected: true, version: "0.6.0", socketPath: "~/.cua/daemon.sock" },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.tsindex 4d5b04e010..401580a431 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@@ -3,8 +3,8 @@/*** The demo host's New Space and "Connect a cloud" answers: this Mac with- * Docker and Lume, the GPU option Lume offers, Cua Cloud rates, the Your- * cloud experiment on, and an account where AWS and Google Cloud have a+ * Docker and Lume, the GPU option Lume offers, the Your cloud+ * experiment on, and an account where AWS and Google Cloud have a* sign-in on this machine and nothing is connected yet. Test passes;* Connect connects. All synthetic.*/@@ -47,7 +47,6 @@ export const DEMO_NEW_SPACE_OPTIONS: NewSpaceOptions = {learnMore: "https://cua.ai/docs/lume/guides/gpu-passthrough",},],- cloudPricing: { vcpuHourUsd: 0.044625, memoryGibHourUsd: 0.0223125 },experiments: { ...NO_EXPERIMENTS, yourCloud: true },maxCpus: 10,};@@ -69,7 +68,6 @@ export function demoMacHostOptions(_defaultLocation: string, vmsRunning: number,const hd = { availableBytes: 212 * GB, totalBytes: 494 * GB, name: "Macintosh HD" };const env: WizardEnv & { localDetails: Record<string, string> | null; lumeSource: string | null; linuxSource: string | null } = {defaultLocation: "local",- cloudAvailable: !pending,localAvailable: true,localReason: null,localBackends: pending ? null : ["lume", "qemu", "container"],@@ -79,7 +77,6 @@ export function demoMacHostOptions(_defaultLocation: string, vmsRunning: number,lumeSource: pending ? null : "auto",linuxSource: pending ? null : "auto",storage: pending ? null : { reserveBytes: 5 * GB, lume: hd, qemu: hd, container: hd, pulled: ["ghcr.io/trycua/linux:24.04"] },- cloudPricing: pending ? null : d.cloudPricing,clouds: [],hosts: [],experiments: d.experiments,@@ -88,7 +85,6 @@ export function demoMacHostOptions(_defaultLocation: string, vmsRunning: number,return {local: { available: env.localAvailable, backends: env.localBackends ?? [], error: null, hostArch: "arm64", storage: env.storage },gpus: env.gpus ?? null,- cloudPricing: env.cloudPricing ?? null,experiments: d.experiments,maxCpus: 10,env,diff --git a/apps/cua-spaces-web/src/bridge/adapters/tauri.ts b/apps/cua-spaces-web/src/bridge/adapters/tauri.tsindex 4de47103ec..1db1da96c5 100644--- a/apps/cua-spaces-web/src/bridge/adapters/tauri.ts+++ b/apps/cua-spaces-web/src/bridge/adapters/tauri.ts@@ -22,7 +22,7 @@ import type {CreateProgress,DaemonStatus,DefaultLocation,- FleetStatus,+ AccountStatus,HostStatus,LoginItemStatus,MachineRow,@@ -253,12 +253,12 @@ export function createTauriAdapter(win: HostWindow = globalThis.window as HostWi"keyvault.revokeGrant": ({ id }) => invoke("keyvault_revoke_grant", { id }),"session.get": async () => {- const [fleet, onboarding, daemon] = await Promise.all([- invoke<FleetStatus>("fleet_status", { probe: false }),+ const [account, onboarding, daemon] = await Promise.all([+ invoke<AccountStatus>("account_status", { probe: false }),invoke<OnboardingState>("onboarding_state").catch((): OnboardingState => ({ completed: true })),invoke<DaemonStatus>("daemon_status").catch(() => null),]);- return { fleet, onboarding, daemon };+ return { account, onboarding, daemon };},"session.signIn": () => invoke("begin_sign_in"),"session.signOut": async () => {diff --git a/apps/cua-spaces-web/src/bridge/adapters/webkit.ts b/apps/cua-spaces-web/src/bridge/adapters/webkit.tsindex 5d40ef43b4..c68c8b7ea1 100644--- a/apps/cua-spaces-web/src/bridge/adapters/webkit.ts+++ b/apps/cua-spaces-web/src/bridge/adapters/webkit.ts@@ -31,7 +31,7 @@ import { Emitter, HostError, type DataAdapter } from "../adapter";import { hostOs, THIS_MACHINE, type HostOs } from "../host-os";import { electronTransport, webkitTransport, type HostTransport } from "../transport";import type { AgentEventsPage, AgentSetupRow, PersistentAgent, SpaceAgentRun } from "../contracts/agents";-import type { CancelOutcome, DefaultLocation, HostActionId, HostStatus, MachinePageRow, MachineRow, MachinesView, SpacePowerReport } from "../contracts/host";+import type { CancelOutcome, HostActionId, HostStatus, MachinePageRow, MachineRow, MachinesView, SpacePowerReport } from "../contracts/host";import type { HostWindow } from "../detect";import {DEFAULT_SETTINGS,@@ -109,7 +109,7 @@ export function spaceToRow(s: WkSpace): SpaceRow {return {id: s.id,name: s.name,- provider: s.provider ?? (here ? "local" : "cloud"),+ provider: s.provider ?? (here ? "local" : "direct"),spacesdVersion: s.sdk?.spacesdVersion ?? "",features: s.sdk?.features ?? [],addedAt: added ? new Date(added).toISOString() : undefined,@@ -267,13 +267,8 @@ const lockedBy = (r: WkSettingsRow | undefined) => (r && !r.enabled && r.help?.s/** The core's Settings page back to the values `useSettings` reads. */export function toSettingsSnapshot(s: WkSettings, page: Pick<SettingsValues, "theme" | "hotkey">): SettingsSnapshot {const rows = rowsById(s);- const location = rows.get("default-location");const telemetry = rows.get("telemetry");const loginRow = rows.get("launch-at-login");- const env = lockedBy(location);- const defaultLocation: DefaultLocation | null = location- ? { value: active(location) ?? "local", source: env ? "env" : "config", env, path: "" }- : null;const telemetryOn = telemetry ? active(telemetry) === "on" : DEFAULT_SETTINGS.telemetry;// The rows only this host lays out: what they show now, so the core lays// them out again on the page (null: the host has none).@@ -288,14 +283,14 @@ export function toSettingsSnapshot(s: WkSettings, page: Pick<SettingsValues, "thhotkey: page.hotkey,menuBar: active(rows.get("notch")) === "hide",telemetry: telemetryOn,- defaultLocation: defaultLocation?.value ?? DEFAULT_SETTINGS.defaultLocation,+ defaultLocation: DEFAULT_SETTINGS.defaultLocation,// The core lays out `launch-at-login` once the host read the login item.launchAtLogin: loginRow && loginRow.enabled ? active(loginRow) === "on" : null,updateChannel: s.updateChannel === "beta" || s.updateChannel === "stable" ? s.updateChannel : null,// The core's General row (`settings::auto_connect_row`), when the host lays it out....(rows.has("auto-connect") ? { autoConnect: active(rows.get("auto-connect")) === "on" } : {}),},- defaultLocation,+ defaultLocation: null,telemetry: telemetry? {enabled: telemetryOn,@@ -323,11 +318,9 @@ export function toSettingsSnapshot(s: WkSettings, page: Pick<SettingsValues, "thexport function toSessionSnapshot(s: WkSession, onboarding: WkOnboarding | null = null): SessionSnapshot {return {- fleet: {+ account: {configured: s.cloudConfigured || s.signedIn,authMode: s.signedIn ? "user" : "none",- baseUrl: "",- tokenUrl: "",identity: opt(s.identity),},// The SwiftUI app's first run is its own window; Electron's is the page's.@@ -602,7 +595,6 @@ export function createWebkitAdapter(break;case "defaultLocation":if (value !== "local") throw new HostError("New Spaces can start on This Mac here", "unsupported");- await choose("default-location", value);break;case "launchAtLogin":await choose("launch-at-login", value ? "on" : "off");diff --git a/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json b/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.jsonindex 2230f6dfaa..28a7c82a09 100644--- a/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json+++ b/apps/cua-spaces-web/src/bridge/contracts/bridge-shapes.json@@ -548,21 +548,6 @@"onPath"]},- "CloudPricing": {- "type": "object",- "properties": {- "vcpuHourUsd": {- "type": "number"- },- "memoryGibHourUsd": {- "type": "number"- }- },- "required": [- "vcpuHourUsd",- "memoryGibHourUsd"- ]- },"CloudProviderWire": {"type": "object","properties": {@@ -2426,16 +2411,6 @@"$ref": "#/$defs/GpuChoice"}},- "cloudPricing": {- "anyOf": [- {- "$ref": "#/$defs/CloudPricing"- },- {- "type": "null"- }- ]- },"experiments": {"$ref": "#/$defs/Experiments"},@@ -2468,7 +2443,6 @@"required": ["local","gpus",- "cloudPricing","experiments","maxCpus"]@@ -2754,7 +2728,7 @@"SessionSnapshot": {"type": "object","properties": {- "fleet": {+ "account": {"type": "object","properties": {"configured": {@@ -2768,33 +2742,16 @@"none"]},- "baseUrl": {- "type": "string"- },- "tokenUrl": {- "type": "string"- },"clientId": {"type": "string"},"identity": {"type": "string"- },- "namespaces": {- "type": "array",- "items": {- "type": "string"- }- },- "probeError": {- "type": "string"}},"required": ["configured",- "authMode",- "baseUrl",- "tokenUrl"+ "authMode"]},"onboarding": {@@ -2902,7 +2859,7 @@}},"required": [- "fleet",+ "account","onboarding","daemon"]@@ -3322,7 +3279,6 @@},"provider": {"enum": [- "cloud","local","direct","relay"@@ -3767,15 +3723,11 @@"properties": {"defaultLocation": {"enum": [- "cloud","local","yours","host"]},- "cloudAvailable": {- "type": "boolean"- },"localAvailable": {"type": "boolean"},@@ -3813,16 +3765,6 @@}]},- "cloudPricing": {- "anyOf": [- {- "$ref": "#/$defs/CloudPricing"- },- {- "type": "null"- }- ]- },"clouds": {"type": "array","items": {@@ -3954,7 +3896,6 @@},"required": ["defaultLocation",- "cloudAvailable","localAvailable","maxCpus"]@@ -4093,16 +4034,6 @@"$ref": "#/$defs/GpuChoice"}},- "cloudPricing": {- "anyOf": [- {- "$ref": "#/$defs/CloudPricing"- },- {- "type": "null"- }- ]- },"experiments": {"$ref": "#/$defs/Experiments"},@@ -4128,7 +4059,6 @@"required": ["local","gpus",- "cloudPricing","experiments","maxCpus","env"@@ -4881,7 +4811,6 @@},"provider": {"enum": [- "cloud","local","direct","relay",diff --git a/apps/cua-spaces-web/src/bridge/contracts/host.ts b/apps/cua-spaces-web/src/bridge/contracts/host.tsindex ebab801c9e..ae7f1ee195 100644--- a/apps/cua-spaces-web/src/bridge/contracts/host.ts+++ b/apps/cua-spaces-web/src/bridge/contracts/host.ts@@ -5,7 +5,7 @@* Account, daemon, machine, onboarding, telemetry and Settings shapes.** Hand-written mirror of the Tauri app's adapters (`apps/cua-spaces/src/- * native/fleet.ts`, `native/host.ts`, `native/telemetry.ts`,+ * native/account.ts`, `native/host.ts`, `native/telemetry.ts`,* `components/desktop/NewSpaceWizard.tsx`) and of the app core's* `settings` module (`libs/cua/crates/cua-spaces-app-core/src/settings.rs`).* Rust is the source of truth; these are its JSON (camelCase) shapes.@@ -15,7 +15,7 @@ import type { AgentSetupRow } from "./agents";import type { MachineAccessNotice } from "./devices";import type { Location, Runtime, SpaceKind } from "./spaces";-/* ---- Account (fleet_status, begin_sign_in) ------------------------------ */+/* ---- Account (account_status, begin_sign_in) ------------------------------ *//** What starting a sign-in returns. `browser`: finish in the tab that just* opened. `device`: enter `userCode` at `verificationUri`. */@@ -25,17 +25,13 @@ export interface SignInStart {verificationUri: string;}-/** Cua Cloud account status. */-export interface FleetStatus {+/** The signed-in account (`account_status`). */+export interface AccountStatus {configured: boolean;authMode: "user" | "client-credentials" | "static-token" | "none";- baseUrl: string;- tokenUrl: string;clientId?: string;/** Signed-in user identity (email/subject), when a user session is active. */identity?: string;- namespaces?: string[];- probeError?: string;}/** The local `cua daemon` the app shares Spaces with. */@@ -52,7 +48,7 @@ export interface DaemonStatus {/** `create_space`'s config (the SDK's create options). */export interface SpaceCreateConfig {image?: string;- /** `local`, `cloud`, `host:<machine>`, or a connected cloud's word. */+ /** `local`, `host:<machine>`, or a connected cloud's word. */on?: Location | string;kind?: SpaceKind | "auto";runtime?: Runtime;@@ -637,8 +633,6 @@ export interface SettingsInput {signIn?: SignInPhase;canSignOut?: boolean;menuBar?: boolean;- defaultLocation?: "cloud" | "local" | "yours" | "host";- locationLockedBy?: string | null;telemetry?: { enabled: boolean; lockedBy?: string | null } | null;/** The Keyvault's auto-wipe (none: no Keyvault section). */keyvaultAutoWipe?: boolean | null;diff --git a/apps/cua-spaces-web/src/bridge/contracts/new-space.ts b/apps/cua-spaces-web/src/bridge/contracts/new-space.tsindex 0533e5827c..e8aa9180dc 100644--- a/apps/cua-spaces-web/src/bridge/contracts/new-space.ts+++ b/apps/cua-spaces-web/src/bridge/contracts/new-space.ts@@ -4,7 +4,7 @@/*** New Space and "Connect a cloud": the app core's wizard and sheet records* (`cua-spaces-app-core::wizard`, `::cloud_connect`) and what the hosts- * report for them (`local_status`, `gpu_support`, `cloud_pricing`,+ * report for them (`local_status`, `gpu_support`,* `cloud_status`, `cloud_test`, `cloud_connect`).** Hand-written mirror of the Tauri app's `components/desktop/@@ -19,7 +19,7 @@ import type { Experiments } from "./volume";/* ---- What the host knows (WizardEnv) ------------------------------------- *//** Where a new Space runs (`model::Location`). */-export type WizardLocation = "cloud" | "local" | "yours" | "host";+export type WizardLocation = "local" | "yours" | "host";/** Settings, Experiments (`experiments::Experiments`): one shape, defined with Volume. */export type { Experiments } from "./volume";@@ -81,12 +81,6 @@ export interface GpuChoice {learnMore?: string | null;}-/** This account's Cua Cloud rates (`cloud_pricing`). */-export interface CloudPricing {- vcpuHourUsd: number;- memoryGibHourUsd: number;-}-/** What one connected cloud runs for an image family. */export interface CloudOffer {image: string;@@ -120,14 +114,12 @@ export interface WizardHost {/** What the wizard knows about this machine and account (`wizard::WizardEnv`). */export interface WizardEnv {defaultLocation: WizardLocation;- cloudAvailable: boolean;localAvailable: boolean;localReason?: string | null;localBackends?: string[] | null;maxCpus: number;hostArch?: string | null;storage?: LocalStorage | null;- cloudPricing?: CloudPricing | null;clouds?: ConnectedCloud[];hosts?: WizardHost[];experiments?: Experiments;@@ -143,7 +135,6 @@ export interface WizardEnv {export interface NewSpaceOptions {local: LocalStatus | null;gpus: GpuChoice[] | null;- cloudPricing: CloudPricing | null;experiments: Experiments;/** Upper bound for the CPU slider; null: the page's own count. */maxCpus: number | null;diff --git a/apps/cua-spaces-web/src/bridge/contracts/shapes.ts b/apps/cua-spaces-web/src/bridge/contracts/shapes.tsindex ab9a17ef56..a5d14c5ff6 100644--- a/apps/cua-spaces-web/src/bridge/contracts/shapes.ts+++ b/apps/cua-spaces-web/src/bridge/contracts/shapes.ts@@ -28,7 +28,7 @@ import type {CancelOutcome,DaemonStatus,DefaultLocation,- FleetStatus,+ AccountStatus,HostStatus,MachineRow,OnboardingState,@@ -39,7 +39,6 @@ import type {import type { KeyvaultOverview, KvGrant } from "./keyvault";import type {CloudCheckWire,- CloudPricing,CloudProviderWire,CloudTestWire,ConnectedCloud,@@ -154,7 +153,7 @@ const SpaceRowShape = ref(id: str,hostProgress: opt(SpaceProgressShape),name: str,- provider: oneOf("cloud", "local", "direct", "relay"),+ provider: oneOf("local", "direct", "relay"),spacesdVersion: str,features: strings,addedAt: opt(str),@@ -252,15 +251,11 @@ const MachineRowShape = ref(const SessionShape = ref("SessionSnapshot",obj<SessionSnapshot>()({- fleet: obj<FleetStatus>()({+ account: obj<AccountStatus>()({configured: bool,authMode: oneOf("user", "client-credentials", "static-token", "none"),- baseUrl: str,- tokenUrl: str,clientId: opt(str),identity: opt(str),- namespaces: opt(strings),- probeError: opt(str),}),onboarding: obj<OnboardingState>()({completed: bool,@@ -505,7 +500,6 @@ const GpuShape = ref("GpuChoice",obj<GpuChoice>()({ runtime: str, id: str, label: str, experimental: bool, supported: bool, reason: optNull(str), learnMore: optNull(str) }),);-const PricingShape = ref("CloudPricing", obj<CloudPricing>()({ vcpuHourUsd: num, memoryGibHourUsd: num }));const LocalStatusShape = ref("LocalStatus",obj<LocalStatus>()({@@ -527,15 +521,13 @@ const LocalStatusShape = ref(const WizardEnvShape = ref("WizardEnv",obj<WizardEnv>()({- defaultLocation: oneOf("cloud", "local", "yours", "host"),- cloudAvailable: bool,+ defaultLocation: oneOf("local", "yours", "host"),localAvailable: bool,localReason: optNull(str),localBackends: optNull(strings),maxCpus: num,hostArch: optNull(str),storage: optNull(LocalStorageShape),- cloudPricing: optNull(PricingShape),clouds: opt(list(obj<ConnectedCloud>()({@@ -558,7 +550,6 @@ const createOptions = (strict: boolean) =>obj<NewSpaceOptions>()({local: strict ? LocalStatusShape : nullable(LocalStatusShape),gpus: nullable(list(GpuShape)),- cloudPricing: nullable(PricingShape),experiments: ExperimentsShape,maxCpus: nullable(num),// The SwiftUI host's wizard runs on its env: there it is required.@@ -1181,7 +1172,7 @@ const WkSpaceShape = ref(detail: str,lastUsedAt: num,startedAt: optNull(num),- provider: optNull(oneOf("cloud", "local", "direct", "relay")),+ provider: optNull(oneOf("local", "direct", "relay")),sdk: optNull(object({ features: strings, spacesdVersion: str, reachable: bool, error: optNull(str) })),osName: optNull(str),osPrettyName: optNull(str),diff --git a/apps/cua-spaces-web/src/bridge/contracts/spaces.ts b/apps/cua-spaces-web/src/bridge/contracts/spaces.tsindex 6c3959d300..f0dbe282de 100644--- a/apps/cua-spaces-web/src/bridge/contracts/spaces.ts+++ b/apps/cua-spaces-web/src/bridge/contracts/spaces.ts@@ -6,7 +6,7 @@* them onto, and the create/power/delete state machine's types.** Hand-written mirror, copied from the Tauri app (`apps/cua-spaces/src/- * model/types.ts`, `model/spaces.ts`, `model/creates.ts`, `native/fleet.ts`).+ * model/types.ts`, `model/spaces.ts`, `model/creates.ts`, `native/account.ts`).* The source of truth is Rust: `cua-spaces-app-core::model` (Space,* SpaceRow) and `cua-spaces-app-core::spaces::creating`. serde there is* camelCase, so these names are the JSON the core returns.@@ -58,24 +58,23 @@ export interface SpaceSdkRef {}/**- * Where a Space runs: the SDK's location words. `cloud` is Cua Cloud,- * `local` this Mac, `direct` a machine added by address, `relay` a machine- * of the signed-in account reached through the cua relay.+ * Where a Space runs: the SDK's location words. `local` is this Mac,+ * `direct` a machine added by address, `relay` a machine of the signed-in+ * account reached through the cua relay.*/-export type SpaceProvider = "cloud" | "local" | "direct" | "relay";+export type SpaceProvider = "local" | "direct" | "relay";-/** Where new Spaces can be created (existing machines are added, not created). */-export type Location = "cloud" | "local";+/** Where new Spaces can be created: this Mac, your own cloud, or one of your machines. */+export type Location = "local" | "yours" | "host";/** What kind of machine a Space is. */export type SpaceKind = "container" | "vm";/*** Which engine runs it. Local: `gvisor`, `runc` (containers), `qemu`, `lume`- * (VMs). Cloud: `gvisor` (containers), `kubevirt` (VMs). `auto` lets the SDK- * pick for the location and image.+ * (VMs). `auto` lets the SDK pick for the location and image.*/-export type Runtime = "auto" | "gvisor" | "runc" | "qemu" | "lume" | "kubevirt";+export type Runtime = "auto" | "gvisor" | "runc" | "qemu" | "lume";export interface Space {id: string;@@ -90,12 +89,10 @@ export interface Space {* progress so it doesn't reset when the UI reopens. */startedAt?: number;scene: ThumbnailScene;- /** The group this Space belongs to (a cloud namespace or its location). */- fleetId?: string;/** Machine size label; undefined for the local Mac. */size?: MachineSize;region?: RegionId;- /** Where this Space runs; treated as "cloud" when omitted. */+ /** Where this Space runs; treated as "direct" when omitted. */provider?: SpaceProvider;/** SDK registry facts, when the Space came from the live registry. */sdk?: SpaceSdkRef;@@ -227,7 +224,7 @@ export interface PendingCreate {id: string;name: string;os: SpaceOs;- provider: Location | "relay";+ provider: "local" | "relay";startedAt: number;phase: string;fraction?: number | null;@@ -304,7 +301,7 @@ export type CreateAction =id: string;name: string;os: SpaceOs;- provider: Location | "relay";+ provider: "local" | "relay";now: number;/** The image (its catalog entry names the distribution, kind and* platforms), the kind asked for, and this Mac's CPU architecture. */diff --git a/apps/cua-spaces-web/src/bridge/coverage.ts b/apps/cua-spaces-web/src/bridge/coverage.tsindex 635a4956c1..9f8a658e6c 100644--- a/apps/cua-spaces-web/src/bridge/coverage.ts+++ b/apps/cua-spaces-web/src/bridge/coverage.ts@@ -77,7 +77,7 @@ export const HOST_COVERAGE = {"settings.set": {webkit: {methods: ["settings.choose", "settings.get", "window.setBackgroundColor"],- byDesign: "theme and hotkey are page-side; New Spaces start on This Mac or Cua Cloud only",+ byDesign: "theme and hotkey are page-side; New Spaces start on This Mac only",},tauri: ["ui_storage_set", "telemetry_set_enabled", "set_default_location", "login_item_set", "telemetry_status", "get_default_location", "login_item_status"],},@@ -101,7 +101,7 @@ export const HOST_COVERAGE = {"keyvault.revokeGrant": { webkit: { methods: ["keyvault.revokeGrant"] }, tauri: ["keyvault_revoke_grant"] },"session.get": {webkit: { methods: ["session.get", "onboarding.get"] },- tauri: ["fleet_status", "onboarding_state", "daemon_status"],+ tauri: ["account_status", "onboarding_state", "daemon_status"],},"session.signIn": { webkit: { methods: ["session.signIn"] }, tauri: ["begin_sign_in"] },"session.signOut": { webkit: { methods: ["session.signOut"] }, tauri: ["sign_out"] },diff --git a/apps/cua-spaces-web/src/bridge/derive.ts b/apps/cua-spaces-web/src/bridge/derive.tsindex 47fa252635..ea058290c2 100644--- a/apps/cua-spaces-web/src/bridge/derive.ts+++ b/apps/cua-spaces-web/src/bridge/derive.ts@@ -176,16 +176,15 @@ export function transferText(}/** The step a create is on, in its kind of Space's words (`creating::stage_label`). */-function stageLabel(p: Pick<PendingCreate, "os" | "provider" | "kind" | "phase">): string {- const here = p.provider !== "cloud";+function stageLabel(p: Pick<PendingCreate, "os" | "kind" | "phase">): string {const vm = p.os === "macos" || p.os === "windows" || p.kind === "vm";const container = !vm && p.kind === "container";const os = p.os === "macos" ? "macOS" : p.os === "windows" ? "Windows" : p.os === "linux" ? "Linux" : "";if (p.phase === "pulling" && p.os === "macos") return "Downloading macOS (first time only)…";- if (p.phase === "creating" && here && vm) return "Preparing the disk…";- if (p.phase === "creating" && here && container) return "Creating the container…";- if (p.phase === "booting" && here && vm && os) return `Booting ${os}…`;- if (p.phase === "booting" && here && container) return "Starting the container…";+ if (p.phase === "creating" && vm) return "Preparing the disk…";+ if (p.phase === "creating" && container) return "Creating the container…";+ if (p.phase === "booting" && vm && os) return `Booting ${os}…`;+ if (p.phase === "booting" && container) return "Starting the container…";return PHASE_LABEL[p.phase] ?? "Starting…";}@@ -288,7 +287,7 @@ function fallbackCompose(spaces: Space[], state: CreatesState): Space[] {lastUsedAt: p.startedAt,startedAt: p.startedAt,scene: SCENES[p.os],- provider: p.provider === "relay" ? "relay" : p.provider,+ provider: p.provider,progress: {phase: p.phase,permille: p.permille,@@ -660,15 +659,12 @@ export function settingsPage(/** Settings, AI agents: the coding agents read from the host (null: not yet, an empty section). */agents?: Pick<SettingsInput, "agents" | "agentsBusy" | "agentsPending">,): SettingsPage | null {- const loc = settings.values.defaultLocation;const input: SettingsInput = {- identity: session?.fleet.identity ?? null,- apiKeyClient: session?.fleet.authMode === "client-credentials" ? (session.fleet.clientId ?? null) : null,+ identity: session?.account.identity ?? null,+ apiKeyClient: session?.account.authMode === "client-credentials" ? (session.account.clientId ?? null) : null,signIn: signIn ?? { kind: "idle" },- canSignOut: session?.fleet.authMode === "user",+ canSignOut: session?.account.authMode === "user",menuBar: settings.values.menuBar,- defaultLocation: loc === "cloud" || loc === "local" ? "local" : loc.startsWith("host:") ? "host" : "yours",- locationLockedBy: settings.defaultLocation?.source === "env" ? (settings.defaultLocation.env ?? null) : null,telemetry: settings.telemetry? {enabled: settings.telemetry.enabled,diff --git a/apps/cua-spaces-web/src/bridge/hooks.ts b/apps/cua-spaces-web/src/bridge/hooks.tsindex 83fa1576af..75230d60b7 100644--- a/apps/cua-spaces-web/src/bridge/hooks.ts+++ b/apps/cua-spaces-web/src/bridge/hooks.ts@@ -463,7 +463,7 @@ export function useOnboarding(): OnboardingHook {const saved = useSavedOnboarding();const [hints, setHints] = useState<{ permissions: PermissionHint[]; configured: boolean } | null>(null);- const identity = session?.signedIn ? (session.fleet.identity ?? null) : null;+ const identity = session?.signedIn ? (session.account.identity ?? null) : null;const ctx = { menuBar: settings?.values.menuBar ?? false, observe: store ? store.trackOnboarding.bind(store) : undefined };const state = saved.state;diff --git a/apps/cua-spaces-web/src/bridge/new-space-hooks.ts b/apps/cua-spaces-web/src/bridge/new-space-hooks.tsindex c495d9fd10..2a5f6807d4 100644--- a/apps/cua-spaces-web/src/bridge/new-space-hooks.ts+++ b/apps/cua-spaces-web/src/bridge/new-space-hooks.ts@@ -9,7 +9,7 @@ import { BridgeContext } from "./BridgeProvider";import type { CoreClient } from "./core";import type { CloudConnectAction, CloudConnectView, CloudTarget, RuntimeFix, RuntimeSwitch, WizardAction, WizardEnv, WizardView } from "./contracts/new-space";import type { Space, SpaceOs } from "./contracts/spaces";-import { useMachines, useSession, useSettings, useSpaces } from "./hooks";+import { useMachines, useSettings, useSpaces } from "./hooks";import { newPendingId } from "./store";import {CLOSED_NEW_SPACE,@@ -39,7 +39,6 @@ function useNewSpaceEnv(): { core: CoreClient; env: WizardEnv; s: NewSpaceSessioif (!ctx) throw new Error("bridge hooks need a <BridgeProvider> above them");const s = useSyncExternalStore(subscribe, read, read);const { data: settings } = useSettings();- const { data: sessionData } = useSession();const { data: machines } = useMachines();const core = ctx.core;const env =@@ -49,10 +48,9 @@ function useNewSpaceEnv(): { core: CoreClient; env: WizardEnv; s: NewSpaceSessiooptions: s.options,clouds: s.clouds,defaultLocation: settings?.values.defaultLocation,- cloudAvailable: Boolean(sessionData?.fleet.configured),machines,})- : ({ defaultLocation: "local", cloudAvailable: false, localAvailable: true, maxCpus: 8 } as WizardEnv));+ : ({ defaultLocation: "local", localAvailable: true, maxCpus: 8 } as WizardEnv));return { core, env, s };}diff --git a/apps/cua-spaces-web/src/bridge/new-space.ts b/apps/cua-spaces-web/src/bridge/new-space.tsindex ff002373b1..533a192029 100644--- a/apps/cua-spaces-web/src/bridge/new-space.ts+++ b/apps/cua-spaces-web/src/bridge/new-space.ts@@ -100,15 +100,13 @@ const CONTAINER_BACKENDS = ["container", "managed", "docker", "runsc"];export interface EnvInput {options: NewSpaceOptions | null;clouds: CloudStatusWire | null;- /** Settings' `defaultLocation`: `local`, `cloud`, `host:<id>` or a cloud word. */+ /** Settings' `defaultLocation`: `local`, `host:<id>` or a cloud word. */defaultLocation: string | undefined;- cloudAvailable: boolean;machines: readonly (Pick<Machine, "id" | "name" | "via" | "online" | "os" | "limits" | "current"> & Pick<Partial<Machine>, "device" | "notSharing">)[] | undefined;}function location(core: CoreClient, on: string | undefined): WizardLocation {if (!on || on === "local") return "local";- if (on === "cloud") return "local"; // Cua Cloud has endedif (on.startsWith("host:")) return "host";return isCloudWord(core, on) ? "yours" : "local";}@@ -123,14 +121,12 @@ export function wizardEnv(core: CoreClient, input: EnvInput): WizardEnv {const cores = globalThis.navigator?.hardwareConcurrency || 8;return {defaultLocation: location(core, input.defaultLocation),- cloudAvailable: input.cloudAvailable,localAvailable: local ? canContainer || canMacos : true,localReason: local?.error ?? null,localBackends: local ? [...local.backends] : null,maxCpus: input.options?.maxCpus ?? Math.max(2, Math.min(16, cores)),hostArch: local?.hostArch ?? null,storage: local?.storage ?? null,- cloudPricing: input.options?.cloudPricing ?? null,clouds: input.clouds ? connectedClouds(core, input.clouds) : [],// Only machines `on="host:<id>"` resolves: never a device of its own.// One that is online but not shared says so, as the SDK's hosts do.diff --git a/apps/cua-spaces-web/src/bridge/ops/new-space.ts b/apps/cua-spaces-web/src/bridge/ops/new-space.tsindex 670ab58c1d..67c096bc38 100644--- a/apps/cua-spaces-web/src/bridge/ops/new-space.ts+++ b/apps/cua-spaces-web/src/bridge/ops/new-space.ts@@ -5,7 +5,7 @@* The host operations New Space and "Connect a cloud" add. Each is an* existing Tauri command under a host-neutral name:*- * - `spaces.createOptions`: `local_status`, `gpu_support`, `cloud_pricing`+ * - `spaces.createOptions`: `local_status`, `gpu_support`* and the stored experiments (the wizard's `WizardEnv` beyond Spaces,* machines, settings and the session).* - `spaces.add`: `add_space` ("Connect by address").@@ -34,7 +34,6 @@ import type {CloudTarget,CloudTestWire,GpuChoice,- CloudPricing,LocalStatus,NewSpaceOptions,} from "../contracts/new-space";@@ -65,7 +64,7 @@ export const NEW_SPACE_OPERATIONS = [export const NEW_SPACE_COVERAGE = {"spaces.createOptions": {webkit: { methods: ["spaces.createOptions"] },- tauri: ["local_status", "gpu_support", "cloud_pricing"],+ tauri: ["local_status", "gpu_support"],},"spaces.add": { webkit: { methods: ["spaces.add"] }, tauri: ["add_space"] },"clouds.status": { webkit: { methods: ["clouds.status"] }, tauri: ["cloud_tool"] },@@ -92,12 +91,11 @@ export function newSpaceTauriOps(invoke: Invoke, readUi: (key: string) => stringconst tool = <T>(name: string, args: Record<string, unknown>) => invoke<T>("cloud_tool", { tool: name, args });return {"spaces.createOptions": async () => {- const [local, gpus, cloudPricing] = await Promise.all([+ const [local, gpus] = await Promise.all([invoke<LocalStatus | null>("local_status").catch(() => null),invoke<GpuChoice[] | null>("gpu_support").catch(() => null),- invoke<CloudPricing | null>("cloud_pricing").catch(() => null),]);- return { local: local ?? null, gpus: gpus ?? null, cloudPricing: cloudPricing ?? null, experiments: readExperiments(readUi(EXPERIMENTS_KEY)), maxCpus: null };+ return { local: local ?? null, gpus: gpus ?? null, experiments: readExperiments(readUi(EXPERIMENTS_KEY)), maxCpus: null };},"spaces.add": ({ url, token, name }) => invoke<SpaceRow>("add_space", { url, token: token || null, name: name || null }),"clouds.status": async () => (await tool<CloudStatusWire | null>("cloud_status", {})) ?? { providers: [] },diff --git a/apps/cua-spaces-web/src/bridge/protocol.ts b/apps/cua-spaces-web/src/bridge/protocol.tsindex 00a1ad64b2..10e0a18757 100644--- a/apps/cua-spaces-web/src/bridge/protocol.ts+++ b/apps/cua-spaces-web/src/bridge/protocol.ts@@ -15,7 +15,7 @@import type {DaemonStatus,DefaultLocation,- FleetStatus,+ AccountStatus,HostStatus,LoginItemStatus,MachineRow,@@ -70,7 +70,7 @@ export interface SettingsValues {hotkey: string;/** Usage telemetry (`$CUA_HOME/config.toml`, same as `cua telemetry`). */telemetry: boolean;- /** Where New Space starts: `local`, `cloud`, `host:<id>`, or a cloud word. */+ /** Where New Space starts: `local`, `host:<id>`, or a cloud word. */defaultLocation: string;/** The app opens at login, as the system reports it (`login_item::LoginItemStatus`* is `enabled` or `requiresApproval`). Null: this host can't say. */@@ -172,7 +172,7 @@ export const UI_STORAGE_KEYS = {/* ---- Session ------------------------------------------------------------- */export interface SessionSnapshot {- fleet: FleetStatus;+ account: AccountStatus;onboarding: OnboardingState;daemon: DaemonStatus | null;/** A native host's sign-in waiting for the browser (it runs the flowdiff --git a/apps/cua-spaces-web/src/bridge/store.ts b/apps/cua-spaces-web/src/bridge/store.tsindex d2faa3c950..a08df46bbc 100644--- a/apps/cua-spaces-web/src/bridge/store.ts+++ b/apps/cua-spaces-web/src/bridge/store.ts@@ -618,7 +618,7 @@ export class BridgeStore {const os = osOf(req);const on = config.on ?? this.settingsSnap?.values.defaultLocation ?? "local";// A Space on one of your machines or in your own cloud lists as a relay machine.- const provider = on === "local" || on === "cloud" ? on : "relay";+ const provider = on === "local" ? on : "relay";// The machine a create on one of yours runs on: its id lets the core// fold that machine's own record of the Space into this row, its name// is what the row and a failure call it.@@ -956,10 +956,10 @@ export class BridgeStore {private publishSession(): void {if (!this.sessionSnap) return;- const identity = this.sessionSnap.fleet.identity ?? null;+ const identity = this.sessionSnap.account.identity ?? null;const data: SessionData = {...this.sessionSnap,- signedIn: this.sessionSnap.fleet.authMode !== "none" && this.sessionSnap.fleet.configured,+ signedIn: this.sessionSnap.account.authMode !== "none" && this.sessionSnap.account.configured,identity,signIn: this.signInPhase,signInUrl: this.signInPhase.kind === "waiting" ? this.signInUrl : null,@@ -975,7 +975,7 @@ export class BridgeStore {// A native host signed in, whichever attempt (a retry's, or one before// it) finished: the wait is over.const snap = this.sessionSnap;- if (snap && snap.hostSignIn !== undefined && snap.fleet.authMode === "user" && snap.fleet.identity) {+ if (snap && snap.hostSignIn !== undefined && snap.account.authMode === "user" && snap.account.identity) {this.stopSignInTimer();this.signInPhase = { kind: "idle" };return;diff --git a/apps/cua-spaces-web/src/bridge/webkit-protocol.ts b/apps/cua-spaces-web/src/bridge/webkit-protocol.tsindex 509630ca3d..2b1ac758ba 100644--- a/apps/cua-spaces-web/src/bridge/webkit-protocol.ts+++ b/apps/cua-spaces-web/src/bridge/webkit-protocol.ts@@ -243,7 +243,7 @@ export interface WkSpace {detail: string;lastUsedAt: number;startedAt?: number | null;- provider?: "cloud" | "local" | "direct" | "relay" | null;+ provider?: "local" | "direct" | "relay" | null;sdk?: { features: string[]; spacesdVersion: string; reachable: boolean; error?: string | null } | null;osName?: string | null;osPrettyName?: string | null;diff --git a/apps/cua-spaces-web/src/components/__tests__/empty-home.test.tsx b/apps/cua-spaces-web/src/components/__tests__/empty-home.test.tsxindex 5f500c4e5b..737fb8c948 100644--- a/apps/cua-spaces-web/src/components/__tests__/empty-home.test.tsx+++ b/apps/cua-spaces-web/src/components/__tests__/empty-home.test.tsx@@ -138,7 +138,7 @@ describe.skipIf(!wasmBuilt)("the empty home (wasm core)", () => {it("opens New Space with the tile's system chosen, on this machine, and never creates", async () => {const core = await testCore();- const env = { defaultLocation: "local", cloudAvailable: false, localAvailable: true, maxCpus: 8 } as const;+ const env = { defaultLocation: "local", localAvailable: true, maxCpus: 8 } as const;for (const [name, os] of [[/^Linux, /, "linux"],[/^macOS, /, "macos"],diff --git a/apps/cua-spaces-web/src/components/shell/sidebar.tsx b/apps/cua-spaces-web/src/components/shell/sidebar.tsxindex 3a906f3068..2ba838c6df 100644--- a/apps/cua-spaces-web/src/components/shell/sidebar.tsx+++ b/apps/cua-spaces-web/src/components/shell/sidebar.tsx@@ -131,7 +131,7 @@ export function AccountFooter() {const footer = session? signInFooter(core, {identity: session.signedIn ? (session.identity ?? "") : null,- cloudConfigured: session.fleet.configured,+ cloudConfigured: session.account.configured,canSignIn: true,signIn: session.signIn,hasUrl: Boolean(session.signInUrl),@@ -197,7 +197,7 @@ export function AccountFooter() {</button>) : null}</div>- {session.fleet.authMode === "user" ? (+ {session.account.authMode === "user" ? (<Tooltip content="Sign out" side="top"><Button variant="ghost" size="icon-sm" aria-label="Sign out" onClick={() => void run(signOut, "Couldn't sign out")}><LogOutIcon className="size-3.5 text-muted-foreground" />diff --git a/apps/cua-spaces-web/src/lib/host-labels.test.ts b/apps/cua-spaces-web/src/lib/host-labels.test.tsindex 2bddef2d2b..e391454282 100644--- a/apps/cua-spaces-web/src/lib/host-labels.test.ts+++ b/apps/cua-spaces-web/src/lib/host-labels.test.ts@@ -38,7 +38,7 @@ describe("host labels", () => {expect(creatingLine(line, "linux")).toBe("This computer \u00b7 Downloading image\u2026");expect(creatingLine(line, "win32")).toBe("This PC \u00b7 Downloading image\u2026");// Elsewhere, or a failure in the core's own words: as it is.- expect(creatingLine("Cua Cloud \u00b7 Starting\u2026", "linux")).toBe("Cua Cloud \u00b7 Starting\u2026");+ expect(creatingLine("Studio \u00b7 Starting\u2026", "linux")).toBe("Studio \u00b7 Starting\u2026");expect(creatingLine("This Mac can't reach its new VM", "linux")).toBe("This Mac can't reach its new VM");});diff --git a/apps/cua-spaces-web/src/lib/spaces.test.ts b/apps/cua-spaces-web/src/lib/spaces.test.tsindex ce396932ee..c81ccbfe25 100644--- a/apps/cua-spaces-web/src/lib/spaces.test.ts+++ b/apps/cua-spaces-web/src/lib/spaces.test.ts@@ -87,7 +87,7 @@ describe("visibleSpaces", () => {describe("machineName", () => {it("names the machine a Space runs on", () => {expect(machineName(MACHINES, SPACES[1]!)).toBe("Mac mini");- expect(machineName(MACHINES, { id: "x", provider: "cloud" })).toBe("Cua Cloud");+ expect(machineName(MACHINES, { id: "x", provider: "direct" })).toBe("a computer added by address");expect(machineName(MACHINES, { id: "x", provider: "relay", hostName: "Linux box" })).toBe("Linux box");expect(machineName(MACHINES, { id: "x", provider: "relay" })).toBe("Unknown computer");});diff --git a/apps/cua-spaces-web/src/lib/spaces.ts b/apps/cua-spaces-web/src/lib/spaces.tsindex a2e6dd8c87..67d3a1cd33 100644--- a/apps/cua-spaces-web/src/lib/spaces.ts+++ b/apps/cua-spaces-web/src/lib/spaces.ts@@ -98,8 +98,8 @@ export function machineName(machines: readonly Machine[], space: Pick<Space, "idconst machine = machines.find((m) => m.spaceIds.includes(space.id));if (machine) return machine.name;if (space.hostName) return space.hostName;- if (space.provider === "direct") return "a computer added by address";- return space.provider === "cloud" || space.provider === undefined ? "Cua Cloud" : "Unknown computer";+ if (space.provider === "direct" || space.provider === undefined) return "a computer added by address";+ return "Unknown computer";}/** What a Space's ⌘K entries also match: its OS, state, detail and the machine it runs on. */@@ -211,13 +211,12 @@ export function canDelete(space: Pick<Space, "id" | "status" | "cloudDelete">):const PROVIDER: Record<Exclude<NonNullable<Space["provider"]>, "local">, string> = {relay: "Your computer, through the Cua relay",direct: "A computer added by address",- cloud: "Cua Cloud",};/** Where it runs, in words. */export function locationLabel(space: Pick<Space, "provider" | "cloudPlace">): string {if (space.cloudPlace) return space.cloudPlace;- const provider = space.provider ?? "cloud";+ const provider = space.provider ?? "direct";return provider === "local" ? thisComputerLabel() : PROVIDER[provider];}diff --git a/apps/cua-spaces/README.md b/apps/cua-spaces/README.mdindex 93e4eb4acb..117d6341fe 100644--- a/apps/cua-spaces/README.md+++ b/apps/cua-spaces/README.md@@ -66,10 +66,8 @@ is a step-by-step sheet:1. **System**: Linux, Windows or macOS, the image (a dropdown of the publishedentries of `libs/images/sandbox-images.json`, the same list the docs show),- and where it runs: This Mac. Cua Cloud has ended and is not offered (the- core's `CLOUD_SPACES_OFFERED` is off); `cloud:` Spaces registered before- still list, answer that it has ended on any action, and can be removed from- the list. **Advanced** picks the kind (container or virtual+ and where it runs: This Mac, one of your own computers, or your own cloud+ account. Cua no longer rents cloud machines. **Advanced** picks the kind (container or virtualmachine, when the image comes in both) and the runtime, offering only whatthe image runs there: containers `auto`, `gvisor`, `runc`; VMs `auto` andthe image's `qemu` or `lume`.@@ -148,9 +146,8 @@ The app signs in with the device grant (Settings → Sign in to Cua); the sessiois the credential store shared with the CLI and the daemon, and it drives therelay account and this device's enrollment. Cua Cloud has ended, so the appbuilds no Cua Cloud client and reads no Cua Cloud credentials from the-environment. The default location is `default.on` in `$CUA_HOME/config.toml`-(Settings → Default location); `CUA_DEFAULT_ON` overrides it and Settings shows-that read-only. `./run-live.sh` starts the daemon.+environment. The default location is `default.on` in `$CUA_HOME/config.toml`;+`CUA_DEFAULT_ON` overrides it. `./run-live.sh` starts the daemon.The Tauri command contract is listed in `TELEPORT.md`.diff --git a/apps/cua-spaces/TELEPORT.md b/apps/cua-spaces/TELEPORT.mdindex 9b41447f1c..9e20417f05 100644--- a/apps/cua-spaces/TELEPORT.md+++ b/apps/cua-spaces/TELEPORT.md@@ -14,7 +14,7 @@ pieces live. Architecture overview: `README.md`.| Golden (macOS) | `scripts/golden/` | Lume image with `Cua Spacesd.app` + `CuaDriverLocal.app` |Removed: `mcp/spaces_mcp.py` and `agent_harness.py` (now `cua daemon mcp` and-`cua_spaces::agents`), the app's own Fleet REST client, Lume CLI driver,+`cua_spaces::agents`), Lume CLI driver,loopback WebSocket relay, rcdp CLI teleport, and the in-guest rcdpd /rcdp-handoff / computer-server daemons.@@ -50,14 +50,13 @@ Agent CLIs: Settings → AI agents installs the cua skills and registers## 3. Tauri command contract-Space ids are `direct:<host:port>`, `local:<name>` and `relay:<id>`. A `cloud:<name>`-Space registered before Cua Cloud ended still lists, answers that it has ended-on any action, and can be removed from the list.+Space ids are `direct:<host:port>`, `local:<name>` and `relay:<id>`. A legacy `cloud:<name>`+row reads as `direct`.| Area | Commands || --- | --- || Roster | `list_spaces`, `space_info(spaceId)`, `add_space(url, token, name)`, `create_space({image, on, kind, runtime, name, …})`, `delete_space`, `remove_space`, `get_default_location`, `set_default_location(on)`; event `spaces:changed` |-| Status | `fleet_status` (who is signed in; reads the local session), `begin_sign_in`, `sign_out`, `daemon_status`, `ensure_daemon`, `local_status` |+| Status | `account_status` (who is signed in; reads the local session), `begin_sign_in`, `sign_out`, `daemon_status`, `ensure_daemon`, `local_status` || This machine | `host_status`, `host_setup`, `host_stop_sharing`, `host_start_sharing`, `host_remove`, `onboarding_state`, `complete_onboarding`, `installer_*` || Space ops | `space_screenshot`, `send_files_to_space`, `list_remote_windows`, `remote_window_thumbnail`, `space_app_icon`, `list_space_agents` || Streams | `open_space_stream(space, {kind: display|window}, opts)` → ticketed `wsUrl` (the Space's own ticket URL), `close_space_stream` |diff --git a/apps/cua-spaces/docs/openclaw.md b/apps/cua-spaces/docs/openclaw.mdindex 702913c49b..90e2d4dbc5 100644--- a/apps/cua-spaces/docs/openclaw.md+++ b/apps/cua-spaces/docs/openclaw.md@@ -43,8 +43,8 @@ openclaw mcp list- **Cua Spaces app running** for the host-side windows. It owns the loopbackcontrol server that draws picture-in-picture, viewer and streamed windows(`~/.cua/spaces-control.json`).-- **Cua Cloud credentials** (`cua auth login`) for cloud Spaces. Local Spaces do- not need them.+- **Your cloud account** (connected in the app) for Spaces on your own cloud.+ Local Spaces do not need it.- **For local macOS Spaces, a golden VM** (see `scripts/golden/`).- **Unity licensing**: a Space that runs the Unity Editor consumes a seat fromyour account's per-machine Personal seat pool. `delete_space` returns thediff --git a/apps/cua-spaces/package.json b/apps/cua-spaces/package.jsonindex 0cba39e111..9477f656be 100644--- a/apps/cua-spaces/package.json+++ b/apps/cua-spaces/package.json@@ -3,7 +3,7 @@"private": true,"version": "0.16.0","license": "FSL-1.1-MIT",- "description": "Cua Spaces notch fleet portal - Tauri 2 prototype with synthetic data",+ "description": "Cua Spaces notch portal - Tauri 2 prototype with synthetic data","type": "module","scripts": {"dev": "node scripts/build-core-wasm.mjs && vite",diff --git a/apps/cua-spaces/src-tauri/src/commands.rs b/apps/cua-spaces/src-tauri/src/commands.rsindex 3700439776..cb212c6a60 100644--- a/apps/cua-spaces/src-tauri/src/commands.rs+++ b/apps/cua-spaces/src-tauri/src/commands.rs@@ -33,10 +33,9 @@ fn hotspot_changed(app: &AppHandle, status: &HotspotStatus) {// ------------------------------------------------------------- account-/// Who is signed in. Named `fleet_status` for the web UI bridge that still-/// calls it; it reads the local session and makes no network call.+/// Who is signed in; reads the local session and makes no network call.#[tauri::command]-pub async fn fleet_status(state: State<'_, AppState>) -> CmdResult<AccountStatus> {+pub async fn account_status(state: State<'_, AppState>) -> CmdResult<AccountStatus> {Ok(state.0.account_status().await)}@@ -129,22 +128,6 @@ pub async fn ensure_daemon(state: State<'_, AppState>) -> CmdResult<DaemonStatusOk(state.0.daemon_status(true).await)}-/// Always `None`: Cua Cloud has ended, so there are no rates to estimate with.-#[tauri::command]-pub async fn cloud_pricing(- state: State<'_, AppState>,-) -> CmdResult<Option<cua_spaces_app_core::wizard::CloudPricing>> {- Ok(state.0.cloud_pricing().await)-}--/// Always `None`: Cua Cloud has ended, so Settings has no Billing row.-#[tauri::command]-pub async fn billing_status(- state: State<'_, AppState>,-) -> CmdResult<Option<cua_spaces_app_core::billing::BillingStatus>> {- state.0.billing_status().await-}-#[tauri::command]pub async fn local_status(state: State<'_, AppState>) -> CmdResult<LocalStatus> {Ok(state.0.local_status().await)diff --git a/apps/cua-spaces/src-tauri/src/core.rs b/apps/cua-spaces/src-tauri/src/core.rsindex 0dcec01086..0fd68b4364 100644--- a/apps/cua-spaces/src-tauri/src/core.rs+++ b/apps/cua-spaces/src-tauri/src/core.rs@@ -13,8 +13,8 @@//! hotspot, agents) are SDK calls. No ssh, no rcdp CLI, no Python.//! - The signed-in user ([`SessionHandle`], the device-authorization grant)//! drives the relay account and this device's enrollment. There is no-//! other credential source: Cua Cloud has ended, so the app builds no-//! Fleet client and calls no Cua Cloud API.+//! other credential source: Cua Cloud has ended, so the app calls no Cua+//! Cloud API.//! - `cua daemon` is connected (or started) so CLI and MCP clients share//! Spaces with the app. Every Space's media tickets are safe in a URL, so//! the webview attaches to them directly.@@ -243,8 +243,7 @@ pub enum AuthMode {None,}-/// `fleet_status`: the signed-in account. The command keeps its name for-/// the web UI bridge that still calls it; it reads the local session and+/// `account_status`: the signed-in account. It reads the local session and/// makes no network call.#[derive(Clone, Debug, Serialize)]#[serde(rename_all = "camelCase")]@@ -927,7 +926,7 @@ impl AppCore {// --------------------------------------------------------- account- /// `fleet_status`: who is signed in. Reads the local session; no+ /// `account_status`: who is signed in. Reads the local session; no/// network call.pub async fn account_status(&self) -> AccountStatus {let signed_in = self.signed_in.load(Ordering::Relaxed);@@ -1080,23 +1079,6 @@ impl AppCore {}}- // ----------------------------------------------------------- cloud-- /// `cloud_pricing`: always `None` (no estimate). The rates came from the- /// Cua Cloud API, which has ended, and the app does not offer new cloud- /// Spaces.- pub async fn cloud_pricing(&self) -> Option<cua_spaces_app_core::wizard::CloudPricing> {- None- }-- /// `billing_status`: always `None`. The Cua Cloud billing API has ended,- /// so the app no longer calls it and Settings hides the Billing row.- pub async fn billing_status(- &self,- ) -> CmdResult<Option<cua_spaces_app_core::billing::BillingStatus>> {- Ok(None)- }-// ----------------------------------------------------------- local/// `local_status`: which local backends are usable (read-only probe).@@ -1225,7 +1207,7 @@ impl AppCore {let parsed = On::parse(on).map_err(msg)?;if parsed.is_existing_machine() {return Err(format!(- "{parsed} names one computer; the default location is local or cloud"+ "{parsed} names one computer; the default location is local or a cloud of yours"));}let mut settings = self.settings()?;diff --git a/apps/cua-spaces/src-tauri/src/lib.rs b/apps/cua-spaces/src-tauri/src/lib.rsindex 7803b60152..91f93df8ef 100644--- a/apps/cua-spaces/src-tauri/src/lib.rs+++ b/apps/cua-spaces/src-tauri/src/lib.rs@@ -441,14 +441,12 @@ pub fn run() {set_display_style,open_external,sf_symbol::sf_symbol,- commands::fleet_status,+ commands::account_status,commands::begin_sign_in,commands::sign_out,commands::daemon_status,commands::ensure_daemon,commands::local_status,- commands::cloud_pricing,- commands::billing_status,commands::host_arch,commands::list_spaces,commands::space_info,diff --git a/apps/cua-spaces/src-tauri/src/viewer_windows.rs b/apps/cua-spaces/src-tauri/src/viewer_windows.rsindex b57ebe1d49..98586a97c3 100644--- a/apps/cua-spaces/src-tauri/src/viewer_windows.rs+++ b/apps/cua-spaces/src-tauri/src/viewer_windows.rs@@ -1674,13 +1674,13 @@ mod tests {#[test]fn labels_are_sanitized_and_prefixed() {assert_eq!(- space_window_label("fleet:ns/claim-1"),- "space-fleet-ns-claim-1"+ space_window_label("relay:ns/claim-1"),+ "space-relay-ns-claim-1");assert_eq!(pip_window_label("abc_DEF-1"), "pip-abc_DEF-1");assert_eq!(- window_stream_label("fleet:ns/claim-1"),- "win-fleet-ns-claim-1"+ window_stream_label("relay:ns/claim-1"),+ "win-relay-ns-claim-1");assert_eq!(sanitize_label(""), "x");}@@ -1690,8 +1690,8 @@ mod tests {// Both the space id and the (rcdp handle) window id are sanitized, so a// handle like "0x1f/2" can never break Tauri's label alphabet.assert_eq!(- winone_window_label("fleet:ns/claim-1", "0x1f/2"),- "winone-fleet-ns-claim-1-0x1f-2"+ winone_window_label("relay:ns/claim-1", "0x1f/2"),+ "winone-relay-ns-claim-1-0x1f-2");// An empty window id still yields a valid, unique-per-space label.assert_eq!(winone_window_label("space", ""), "winone-space-x");@@ -1703,8 +1703,8 @@ mod tests {#[test]fn primary_winone_label_is_unsuffixed_and_replicas_are_distinct() {assert_eq!(- winone_window_label_at("fleet:ns/claim-1", "0x1f/2", 1),- winone_window_label("fleet:ns/claim-1", "0x1f/2"),+ winone_window_label_at("relay:ns/claim-1", "0x1f/2", 1),+ winone_window_label("relay:ns/claim-1", "0x1f/2"),);let primary = winone_window_label_at("space", "0x1f", 1);let replica = winone_window_label_at("space", "0x1f", 2);diff --git a/apps/cua-spaces/src-tauri/tests/commands.rs b/apps/cua-spaces/src-tauri/tests/commands.rsindex 98adeb1bd3..8e40cc1f1e 100644--- a/apps/cua-spaces/src-tauri/tests/commands.rs+++ b/apps/cua-spaces/src-tauri/tests/commands.rs@@ -327,8 +327,7 @@ async fn cloud_creates_fail_because_cua_cloud_has_ended() {}/// A `cloud:` Space registered before Cua Cloud ended stays in the roster.-/// Every action on it answers the one ended message, with no Fleet client-/// and no network call, and "Remove from List" still forgets it.+/// Every action on it answers the one ended message, with no network call, and "Remove from List" still forgets it.#[tokio::test]async fn a_legacy_cloud_space_is_listed_answers_the_ended_message_and_can_be_removed() {let home = tempfile::tempdir().unwrap();@@ -420,7 +419,7 @@ async fn default_location_is_stored_in_the_cua_home_config() {.set_default_location("direct:127.0.0.1:3211").unwrap_err();assert!(e.contains("one computer"), "{e}");- let e = app.set_default_location("fleet").unwrap_err();+ let e = app.set_default_location("elsewhere").unwrap_err();assert!(e.contains("cloud"), "{e}");assert_eq!(app.set_default_location("local").unwrap().value, "local");}diff --git a/apps/cua-spaces/src/App.createDrop.test.tsx b/apps/cua-spaces/src/App.createDrop.test.tsxindex 1a4e8379bc..9c0cd0e5c2 100644--- a/apps/cua-spaces/src/App.createDrop.test.tsx+++ b/apps/cua-spaces/src/App.createDrop.test.tsx@@ -8,11 +8,11 @@ import { App } from "./App";import { FIXTURE_NOW } from "./model/fixtures";import type { SpaceRow } from "./model/spaces";import type { NativeBridge } from "./native/bridge";-import type { FleetBridge } from "./native/fleet";+import type { SpacesBridge } from "./native/spacesBridge";import type { TeleportBridge } from "./native/teleport";import type { PortalEnvironment, PortalGeometry, WindowMode } from "./native/types";import type { WindowDragBridge, WindowDragEvent } from "./native/windowDrag";-import { fakeFleetBridge } from "./test/fakeFleet";+import { fakeSpacesBridge } from "./test/fakeSpacesBridge";// The native drag effect reaches for a couple of Tauri window APIs; stub them.vi.mock("@tauri-apps/api/window", () => ({@@ -31,7 +31,7 @@ const SIZES: Record<WindowMode, { w: number; h: number }> = {ambient: { w: 420, h: 38 },"ambient-teleport": { w: 420, h: 96 },switcher: { w: 760, h: 320 },- "create-fleet": { w: 600, h: 700 },+ "create-space": { w: 600, h: 700 },};function geom(mode: WindowMode): PortalGeometry {const s = SIZES[mode];@@ -96,12 +96,12 @@ const NEW_SPACE: SpaceRow = {reachable: true,};-function fakeFleet(- createSpace: FleetBridge["createSpace"],- defaultLocation: FleetBridge["defaultLocation"] = async () => ({ value: "local", source: "config", path: "/tmp/cua/config.toml" }),-): FleetBridge {+function makeFakeBridge(+ createSpace: SpacesBridge["createSpace"],+ defaultLocation: SpacesBridge["defaultLocation"] = async () => ({ value: "local", source: "config", path: "/tmp/cua/config.toml" }),+): SpacesBridge {let created = false;- return fakeFleetBridge({+ return fakeSpacesBridge({isNative: true,status: async () => ({ configured: true, authMode: "user", identity: "[email protected]" }),listSpaces: async () => (created ? [NEW_SPACE] : []),@@ -148,7 +148,7 @@ describe("drag an app onto the + tile", () => {render(<Appbridge={nativeNotchedBridge()}- fleet={fakeFleet(createSpace, defaultLocation)}+ spacesBridge={makeFakeBridge(createSpace, defaultLocation)}teleport={fakeTeleport(openPicker)}windowDrag={drag.bridge}now={() => (clock += 1000)}@@ -204,7 +204,7 @@ describe("drag an app onto the + tile", () => {render(<Appbridge={nativeNotchedBridge()}- fleet={fakeFleet(createSpace)}+ spacesBridge={makeFakeBridge(createSpace)}teleport={fakeTeleport(openPicker)}windowDrag={drag.bridge}now={() => (clock += 1000)}diff --git a/apps/cua-spaces/src/App.teleport.test.tsx b/apps/cua-spaces/src/App.teleport.test.tsxindex f23f530c1c..7b1fa02ccf 100644--- a/apps/cua-spaces/src/App.teleport.test.tsx+++ b/apps/cua-spaces/src/App.teleport.test.tsx@@ -28,7 +28,7 @@ const SIZES: Record<WindowMode, { w: number; h: number }> = {ambient: { w: 420, h: 38 },"ambient-teleport": { w: 420, h: 96 },switcher: { w: 760, h: 320 },- "create-fleet": { w: 600, h: 700 },+ "create-space": { w: 600, h: 700 },};function geom(mode: WindowMode): PortalGeometry {diff --git a/apps/cua-spaces/src/App.test.tsx b/apps/cua-spaces/src/App.test.tsxindex 54733a4ffb..43e9da39d9 100644--- a/apps/cua-spaces/src/App.test.tsx+++ b/apps/cua-spaces/src/App.test.tsx@@ -141,7 +141,6 @@ describe("New Space opens a window, never a notch panel", () => {await user.click(screen.getByRole("button", { name: /2 Spaces/ }));await user.keyboard("{Control>}n{/Control}");expect(spacesList.openNewSpace).toHaveBeenCalledTimes(1);- expect(screen.queryByRole("heading", { name: "New Fleet" })).toBeNull();expect(screen.queryByRole("dialog", { name: "New Space" })).toBeNull();expect(await screen.findByRole("button", { name: /2 Spaces/ })).toBeInTheDocument();});diff --git a/apps/cua-spaces/src/App.tsx b/apps/cua-spaces/src/App.tsxindex e116655845..e77da4451c 100644--- a/apps/cua-spaces/src/App.tsx+++ b/apps/cua-spaces/src/App.tsx@@ -21,9 +21,9 @@ import { entryFromCore, type CatalogEntry } from "@trycua/cua/teleport";import type { LocalApp } from "./model/teleport";import { handleAppDrop, hasAppPath } from "./native/appDrop";import { createTeleportAppsBridge, type TeleportAppsBridge } from "./native/teleportApps";-import type { FleetDraft, Space } from "./model/types";+import type { Space } from "./model/types";import type { NativeBridge } from "./native/bridge";-import { createFleetBridge, type FleetBridge, type HotspotStatus } from "./native/fleet";+import { createSpacesBridge, type SpacesBridge, type HotspotStatus } from "./native/spacesBridge";import { createTeleportBridge, type TeleportBridge } from "./native/teleport";import {createWindowDragBridge,@@ -42,7 +42,7 @@ import {import type { DisplayStyle, PortalEnvironment, WindowMode } from "./native/types";import { agentsToolCall, type ToolCall } from "./native/persistent";import { createSetTrayMenu, type SetTrayMenu } from "./native/tray";-import { FleetContext, useFleetSync, viewerRequestFor } from "./state/cloud";+import { SpacesContext, useSpacesSync, viewerRequestFor } from "./state/cloud";import { useTrayMenu } from "./state/trayMenu";import { NEW_SPACE_DROP_ID, NEW_TILE_INDEX, initialState, reduce, type PortalState } from "./state/portal";import { readMenuBar, type SwitcherTheme } from "./state/settings";@@ -51,7 +51,7 @@ import { t as tl, useT } from "./i18n";export interface AppProps {bridge: NativeBridge;/** The shell's Spaces bridge; defaults to the environment-appropriate one. */- fleet?: FleetBridge;+ spacesBridge?: SpacesBridge;/** App-teleport bridge; defaults to the environment-appropriate one. */teleport?: TeleportBridge;/** Opens the main window (Spaces list, New Space, Settings). */@@ -87,7 +87,7 @@ function reportBridgeError(operation: string, error: unknown) {console.error(`[Cua Spaces] ${operation} failed`, error);}-export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportApps, host, tray, now = Date.now, collapseDelayMs = SWITCH_COLLAPSE_MS, initial }: AppProps) {+export function App({ bridge, spacesBridge: spacesBridgeProp, teleport, spacesList, windowDrag, teleportApps, host, tray, now = Date.now, collapseDelayMs = SWITCH_COLLAPSE_MS, initial }: AppProps) {const t = useT(["settings", "teleport"]);const [state, dispatch] = useReducer(reduce, initial, (preset) => preset ?? initialState());const [env, setEnv] = useState<PortalEnvironment | null>(null);@@ -120,8 +120,8 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAconst collapseTimer = useRef<number | null>(null);const noticeTimer = useRef<number | null>(null);- const defaultFleet = useMemo(() => createFleetBridge(), []);- const fleetBridge = fleet ?? defaultFleet;+ const defaultSpacesBridge = useMemo(() => createSpacesBridge(), []);+ const spacesBridge = spacesBridgeProp ?? defaultSpacesBridge;const defaultSpacesList = useMemo(() => createSpacesListBridge(), []);const spacesListBridge = spacesList ?? defaultSpacesList;const defaultTeleport = useMemo(() => createTeleportBridge(), []);@@ -130,7 +130,7 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAconst teleportAppsBridge = teleportApps ?? defaultTeleportApps;const defaultWindowDrag = useMemo(() => createWindowDragBridge(), []);const windowDragBridge = windowDrag ?? defaultWindowDrag;- const fleetSync = useFleetSync(fleetBridge, dispatch, now);+ const spacesSync = useSpacesSync(spacesBridge, dispatch, now);const defaultHost = useMemo(() => createHostBridge(), []);const hostBridge = host ?? defaultHost;// First-run onboarding lives in the main window; the notch only needs the@@ -149,7 +149,7 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAcancelled = true;};}, [hostBridge]);- const { setThisMachine } = fleetSync;+ const { setThisMachine } = spacesSync;useEffect(() => {setThisMachine(hostStatus);}, [hostStatus, setThisMachine]);@@ -157,24 +157,24 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportA// tab's count) and Cua Volume's sync.const defaultTray = useMemo(() => ({ call: agentsToolCall(), setMenu: createSetTrayMenu() }), []);useTrayMenu(state.spaces, tray ?? defaultTray);- const fleetContext = useMemo(- () => ({ live: fleetSync.live, bridge: fleetBridge }),- [fleetSync.live, fleetBridge],+ const spacesContext = useMemo(+ () => ({ live: spacesSync.live, bridge: spacesBridge }),+ [spacesSync.live, spacesBridge],);// Track the network hotspot: seed from the shell, then follow its change// events (so the indicator also clears if the tunnel drops on its own).useEffect(() => {- if (!fleetBridge.isNative) return;+ if (!spacesBridge.isNative) return;let cancelled = false;let unsub: (() => void) | undefined;- void fleetBridge+ void spacesBridge.hotspotStatus().then((status) => {if (!cancelled) setHotspot(status);}).catch(() => {});- void fleetBridge.onHotspotChanged(setHotspot).then((off) => {+ void spacesBridge.onHotspotChanged(setHotspot).then((off) => {if (cancelled) off();else unsub = off;});@@ -182,13 +182,13 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAcancelled = true;unsub?.();};- }, [fleetBridge]);+ }, [spacesBridge]);const stopHotspot = useCallback(() => {- void fleetBridge+ void spacesBridge.stopHotspot().then(setHotspot).catch((error) => reportBridgeError("stop network sharing", error));- }, [fleetBridge]);+ }, [spacesBridge]);// Follow the shell's notch-hover signal (global cursor, focus-independent).useEffect(() => {@@ -331,7 +331,7 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAdispatch({ type: "notify", text: tl("spaces:spaces.create.creating") });// No location: the shell creates it where the default location says,// from the default image.- const id = await fleetSync.createSpace();+ const id = await spacesSync.createSpace();const name = stateRef.current.spaces.find((s) => s.id === id)?.name ?? "New Space";beginTeleportRef.current(id, name, app, entry);} catch (error) {@@ -339,7 +339,7 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAdispatch({ type: "notify", text: tl("errors:errors.spaces.create_failed") });}},- [fleetSync],+ [spacesSync],);const createSpaceAndTeleportRef = useRef(createSpaceAndTeleport);createSpaceAndTeleportRef.current = createSpaceAndTeleport;@@ -850,7 +850,7 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAsetTeleportState(null);return;}- if (state.mode === "create-fleet") dispatch({ type: "cancel-create" });+ if (state.mode === "create-space") dispatch({ type: "cancel-create" });else dismiss();return;}@@ -905,19 +905,19 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportA// Switching to a cloud Space focuses (or opens) its desktop window —// macOS then handles the actual Space switch when it is fullscreen.const space = stateRef.current.spaces.find((s) => s.id === id);- if (!space || !fleetBridge.isNative) return;+ if (!space || !spacesBridge.isNative) return;const request = viewerRequestFor(space);if (request) {- fleetBridge.openSpaceWindow(request).catch((error: unknown) => {+ spacesBridge.openSpaceWindow(request).catch((error: unknown) => {reportBridgeError(`open Space window for ${id}`, error);});}},pin: (space: Space) => {- if (!fleetBridge.isNative) return;+ if (!spacesBridge.isNative) return;const request = viewerRequestFor(space);if (request) {- fleetBridge.pinSpacePip(request).catch((error: unknown) => {+ spacesBridge.pinSpacePip(request).catch((error: unknown) => {reportBridgeError(`pin Space ${space.id}`, error);});}@@ -926,15 +926,14 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAif (space.status === "local") return;beginTeleport(space.id, space.name);},- createFleet: (draft: FleetDraft) => dispatch({ type: "create-fleet", draft, now: now() }),}),- [now, openCreate, fleetBridge, beginTeleport],+ [now, openCreate, spacesBridge, beginTeleport],);// The popped-out Spaces list window owns no Spaces state, so its whole-Space// actions (stream the desktop, pin as PiP) come back here as events.useEffect(() => {- if (!fleetBridge.isNative) return;+ if (!spacesBridge.isNative) return;let cancelled = false;const stops: Array<() => void> = [];void import("@tauri-apps/api/event")@@ -965,11 +964,11 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAcancelled = true;for (const stop of stops) stop();};- }, [fleetBridge, handlers]);+ }, [spacesBridge, handlers]);return (- <FleetContext.Provider value={fleetContext}>+ <SpacesContext.Provider value={spacesContext}><divclassName="portal"data-mode={state.mode}@@ -1019,10 +1018,10 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportAonSelect={handlers.select}onNew={handlers.openCreate}onCollapse={dismiss}- onPin={fleetSync.live || fleetBridge.isNative ? handlers.pin : undefined}+ onPin={spacesSync.live || spacesBridge.isNative ? handlers.pin : undefined}onShareApp={handlers.shareApp}- onDelete={fleetSync.live ? fleetSync.deleteSpace : undefined}- onPower={fleetSync.live ? fleetSync.setPower : undefined}+ onDelete={spacesSync.live ? spacesSync.deleteSpace : undefined}+ onPower={spacesSync.live ? spacesSync.setPower : undefined}hotspotActive={hotspot.active}hotspotSpaceId={hotspot.spaceId}onStopHotspot={stopHotspot}@@ -1061,6 +1060,6 @@ export function App({ bridge, fleet, teleport, spacesList, windowDrag, teleportA)}</div>- </FleetContext.Provider>+ </SpacesContext.Provider>);}diff --git a/apps/cua-spaces/src/components/InstallerFlow.tsx b/apps/cua-spaces/src/components/InstallerFlow.tsxindex ec6e4d6aa4..40523040b3 100644--- a/apps/cua-spaces/src/components/InstallerFlow.tsx+++ b/apps/cua-spaces/src/components/InstallerFlow.tsx@@ -31,7 +31,7 @@ import type { DriveMountInput } from "../model/persistent";import type { SettingsRow } from "../model/window";import type { SpaceOs } from "../model/types";import { answerOrNull, createDriveBridge, type DriveBridge } from "../native/drive";-import type { SignInStart } from "../native/fleet";+import type { SignInStart } from "../native/spacesBridge";import type { HostBridge, HostStatus, OnboardingMode } from "../native/host";import type { AgentDetectReport, AgentSetupReport, InstallerBridge } from "../native/installer";import { onboardingFinishedSignals, onboardingSignals } from "../model/telemetry";diff --git a/apps/cua-spaces/src/components/SettingsPanel.test.tsx b/apps/cua-spaces/src/components/SettingsPanel.test.tsxindex a715ed215f..8fdae4b10f 100644--- a/apps/cua-spaces/src/components/SettingsPanel.test.tsx+++ b/apps/cua-spaces/src/components/SettingsPanel.test.tsx@@ -63,17 +63,6 @@ describe("SettingsPanel account section", () => {});});-describe("SettingsPanel default location", () => {- it("offers no default-location choice while the apps do not offer Cua Cloud", () => {- renderPanel({- defaultLocation: { value: "cloud", source: "env", env: "CUA_DEFAULT_ON", path: "/tmp/cua/config.toml" },- onDefaultLocation: vi.fn(),- });- expect(screen.queryByRole("radiogroup", { name: "New Spaces run on" })).toBeNull();- expect(screen.queryByText(/Cua Cloud/)).toBeNull();- });-});-describe("SettingsPanel device-flow sign-in", () => {/** A mock `AccountAuth` whose event handlers can be fired by the test. */function mockAuth() {@@ -453,8 +442,8 @@ describe("SettingsPanel Experiments", () => {});});-describe("SettingsPanel billing and Teams", () => {- it("hides Cua Cloud billing and opens the account app for Teams", async () => {+describe("SettingsPanel Teams", () => {+ it("opens the account app for Teams", async () => {const auth = {beginSignIn: vi.fn(),signOut: vi.fn(),@@ -465,16 +454,8 @@ describe("SettingsPanel billing and Teams", () => {const props = renderPanel({signedInIdentity: "[email protected]",auth,- billingStatus: async () => ({- billingEnabled: true,- card: null,- credit: { balanceUsdCents: 742 },- billingUrl: "https://example.com/billing",- }),});expect(await screen.findByRole("region", { name: "Teams" })).toBeInTheDocument();- expect(screen.queryByText("$7.42 credit left")).toBeNull();- expect(screen.queryByRole("button", { name: "Manage billing" })).toBeNull();await userEvent.click(screen.getByRole("button", { name: "Manage team" }));expect(props.onOpenExternal).toHaveBeenCalledWith("https://app.cua.ai/team");});diff --git a/apps/cua-spaces/src/components/SettingsPanel.tsx b/apps/cua-spaces/src/components/SettingsPanel.tsxindex 35166bb06e..2ea5990450 100644--- a/apps/cua-spaces/src/components/SettingsPanel.tsx+++ b/apps/cua-spaces/src/components/SettingsPanel.tsx@@ -28,12 +28,11 @@ import { hostOs } from "../model/host";import type { DriveMountInput } from "../model/persistent";import type { SpaceOs } from "../model/types";import { answerOrNull, createDriveBridge, type DriveBridge } from "../native/drive";-import type { DefaultLocation, SignInStart } from "../native/fleet";+import type { SignInStart } from "../native/spacesBridge";import { storageSignals } from "../model/telemetry";import { telemetryBridge, type TelemetryBridge, type TelemetryView } from "../native/telemetry";import { createLoginItemBridge, type LoginItemBridge } from "../native/loginItem";import { writeLaunchChoice, type LoginItemStatus } from "../model/loginItem";-import type { Location } from "../model/types";import { settingsPage, type SettingsRow, type SettingsSection, type SignInPhase } from "../model/window";import { experimentsPage, settingsWithStorage } from "../model/experiments";import { chooseExperimentRow, useExperiments } from "../state/experiments";@@ -97,15 +96,8 @@ interface SettingsPanelProps {auth?: AccountAuth;/** Open a URL in the user's default browser (native bridge / no-op). */onOpenExternal: (url: string) => void;- /** Where new Spaces go by default, and where that came from. */- defaultLocation?: DefaultLocation;- /** Store a new default location (`$CUA_HOME/config.toml`). */- onDefaultLocation?: (on: Location) => Promise<unknown>;/** "Show again": first run from the start. */onShowWelcome?: () => void;- /** Cua Cloud billing (the Billing row): the account's status. "Manage- * billing" opens the website's billing page with `onOpenExternal`. */- billingStatus?: () => Promise<import("../native/fleet").BillingStatus | null>;/** Usage telemetry (the shell's; a fallback outside it). */telemetry?: TelemetryBridge;/** The Cua Volume's storage, mount and cache (the daemon's `drive_*` tools). */@@ -134,10 +126,7 @@ export function SettingsPanel({signedInIdentity,auth,onOpenExternal,- defaultLocation,- onDefaultLocation,onShowWelcome,- billingStatus: readBilling,telemetry: telemetryProp,drive: driveProp,os,@@ -154,20 +143,6 @@ export function SettingsPanel({const drive = useMemo(() => driveProp ?? createDriveBridge(), [driveProp]);const storage = useStorage(drive, os ?? hostOs());- const [locationError, setLocationError] = useState<string | null>(null);- const [locationBusy, setLocationBusy] = useState(false);- const chooseLocation = useCallback(- (on: Location) => {- if (!onDefaultLocation || locationBusy || defaultLocation?.value === on) return;- setLocationBusy(true);- setLocationError(null);- void Promise.resolve(onDefaultLocation(on))- .catch((error: unknown) => setLocationError(error instanceof Error ? error.message : String(error)))- .finally(() => setLocationBusy(false));- },- [onDefaultLocation, locationBusy, defaultLocation?.value],- );-// Privacy: the usage-telemetry switch (the same setting as `cua telemetry// off`). Opening Settings also counts as seeing the first-run notice.const [telemetryView, setTelemetryView] = useState<TelemetryView | null>(null);@@ -346,22 +321,6 @@ export function SettingsPanel({}}, [auth, onOpenExternal]);- // Billing (signed in): the credit left; "Manage billing" is the website.- const [billingStatus, setBillingStatus] = useState<import("../native/fleet").BillingStatus | null>(null);- useEffect(() => {- if (!identity || !readBilling) {- setBillingStatus(null);- return;- }- let cancelled = false;- void readBilling()- .then((s) => !cancelled && setBillingStatus(s))- .catch(() => {});- return () => {- cancelled = true;- };- }, [readBilling, identity]);-const signOut = useCallback(() => {setIdentity(undefined);setPhase({ kind: "idle" });@@ -380,8 +339,6 @@ export function SettingsPanel({signIn: phase,canSignOut: Boolean(auth) && Boolean(identity),menuBar,- defaultLocation: "local",- locationLockedBy: defaultLocation?.source === "env" ? (defaultLocation.env ?? "CUA_DEFAULT_ON") : null,telemetry: telemetryView? {enabled: telemetryView.enabled,@@ -392,7 +349,6 @@ export function SettingsPanel({agents: agentRows,agentsBusy,agentsPending: agentPending,- billing: billingStatus,loginItem: loginStatus? {status: loginStatus,@@ -420,7 +376,6 @@ export function SettingsPanel({case "welcome":onShowWelcome?.();return;- case "billing":case "teams":case "teams-manage":case "teams-billing":@@ -434,7 +389,6 @@ export function SettingsPanel({const choose = (row: SettingsRow, id: string) => {if (row.id.startsWith("experiment:")) chooseExperimentRow(row.id, id, telemetry);else if (row.id === "notch") onMenuBarMode(id === "hide");- else if (row.id === "default-location") chooseLocation(id as Location);else if (row.id === "telemetry") setTelemetry(id === "on");else if (row.id === "launch-at-login") setLaunchAtLogin(id === "on");};@@ -448,7 +402,7 @@ export function SettingsPanel({];const sectionError = (id: string) =>- id === "general" ? locationError : id === "privacy" ? telemetryError : id === "agents" ? agentsError : null;+ id === "privacy" ? telemetryError : id === "agents" ? agentsError : null;return (<divdiff --git a/apps/cua-spaces/src/components/SpaceTile.tsx b/apps/cua-spaces/src/components/SpaceTile.tsxindex 190cb3ac13..8e103e03aa 100644--- a/apps/cua-spaces/src/components/SpaceTile.tsx+++ b/apps/cua-spaces/src/components/SpaceTile.tsx@@ -7,7 +7,7 @@ import { SPACES_CONFIG } from "../model/spaces";import { getScreenshot, rememberScreenshot } from "../model/screenshotCache";import type { Space } from "../model/types";import { powerButton } from "../model/window";-import { useFleet } from "../state/cloud";+import { useSpaces } from "../state/cloud";import { HotspotGlyph } from "./HotspotGlyph";import { OsIcon } from "./OsIcon";import { SfIcon } from "./SfIcon";@@ -52,7 +52,7 @@ const HOVER_PRELOAD_DEBOUNCE_MS = 1500;* not live) never poll and their preload is a no-op.*/function useLiveThumbnail(space: Space): { shot: string | null; preload: () => void } {- const { live, bridge } = useFleet();+ const { live, bridge } = useSpaces();// Seed from the shared cache so an established Space shows its last frame// immediately (no "connecting" flash) instead of the synthetic scene.const [shot, setShot] = useState<string | null>(() => getScreenshot(space.id)?.dataUrl ?? null);diff --git a/apps/cua-spaces/src/components/Switcher.notch.test.tsx b/apps/cua-spaces/src/components/Switcher.notch.test.tsxindex 97354d8ab7..3a2816bc4d 100644--- a/apps/cua-spaces/src/components/Switcher.notch.test.tsx+++ b/apps/cua-spaces/src/components/Switcher.notch.test.tsx@@ -10,7 +10,7 @@ import { Switcher } from "./Switcher";const spaces: Space[] = [{ id: "this-mac", name: "This machine", os: "macos", status: "local", detail: "Local", lastUsedAt: 2, scene: "blank" },- { id: "cloud:aurora", name: "Aurora", os: "linux", status: "running", detail: "Agent testing", lastUsedAt: 1, scene: "blank" },+ { id: "direct:aurora", name: "Aurora", os: "linux", status: "running", detail: "Agent testing", lastUsedAt: 1, scene: "blank" },];function fakeSpacesList(): SpacesListBridge {@@ -31,7 +31,7 @@ function renderSwitcher() {render(<Switcherspaces={spaces}- selectedId="cloud:aurora"+ selectedId="direct:aurora"focusIndex={0}notice={null}onFocus={() => {}}@@ -50,7 +50,7 @@ describe("Switcher (the notch panel)", () => {it("a Space tile switches to that Space; nothing drills in inside the notch", () => {const { onSelect } = renderSwitcher();fireEvent.click(screen.getByRole("option", { name: /Aurora/ }));- expect(onSelect).toHaveBeenCalledWith("cloud:aurora");+ expect(onSelect).toHaveBeenCalledWith("direct:aurora");expect(screen.queryByRole("button", { name: "Back to Spaces" })).toBeNull();expect(screen.getByRole("searchbox")).toBeInTheDocument();});@@ -78,7 +78,7 @@ describe("Switcher (the notch panel)", () => {it("the list button opens the main window on the current Space", () => {const { spacesList } = renderSwitcher();fireEvent.click(screen.getByRole("button", { name: "List view" }));- expect(spacesList.open).toHaveBeenCalledWith(expect.objectContaining({ selectedId: "cloud:aurora" }));+ expect(spacesList.open).toHaveBeenCalledWith(expect.objectContaining({ selectedId: "direct:aurora" }));});it("the gear opens Settings in the main window, not a panel in the notch", () => {diff --git a/apps/cua-spaces/src/components/TeleportDropZone.test.tsx b/apps/cua-spaces/src/components/TeleportDropZone.test.tsxindex 6b6003892d..6499c98b0f 100644--- a/apps/cua-spaces/src/components/TeleportDropZone.test.tsx+++ b/apps/cua-spaces/src/components/TeleportDropZone.test.tsx@@ -89,7 +89,7 @@ function renderZone(props: Partial<Parameters<typeof TeleportDropZone>[0]> = {})const fileSend = props.fileSend ?? fakeFileSend();const result = render(<TeleportDropZone- spaceId="cloud:aurora"+ spaceId="direct:aurora"spaceName="Aurora"fileSend={fileSend}onTeleportApp={onTeleportApp}@@ -136,7 +136,7 @@ describe("the Teleport drop zone", () => {const { fileSend } = renderZone();await user.click(screen.getByRole("button", { name: "Send file…" }));await waitFor(() => expect(fileSend.sendFiles).toHaveBeenCalled());- expect(fileSend.sendFiles).toHaveBeenCalledWith("cloud:aurora", ["/Users/me/notes.pdf"]);+ expect(fileSend.sendFiles).toHaveBeenCalledWith("direct:aurora", ["/Users/me/notes.pdf"]);const status = await screen.findByRole("status");expect(status).toHaveTextContent("/root/Downloads/notes.pdf");expect(status).toHaveTextContent("2.1 MB");@@ -177,7 +177,7 @@ describe("the Teleport drop zone", () => {fireDrop({ type: "drop", position: { x: 120, y: 260 }, paths: ["/tmp/here.txt"] });await waitFor(() =>- expect(fileSend.sendFiles).toHaveBeenCalledWith("cloud:aurora", ["/tmp/here.txt"]),+ expect(fileSend.sendFiles).toHaveBeenCalledWith("direct:aurora", ["/tmp/here.txt"]),);});diff --git a/apps/cua-spaces/src/components/TeleportPicker.test.tsx b/apps/cua-spaces/src/components/TeleportPicker.test.tsxindex 421ad709f7..6fb3e8144f 100644--- a/apps/cua-spaces/src/components/TeleportPicker.test.tsx+++ b/apps/cua-spaces/src/components/TeleportPicker.test.tsx@@ -53,7 +53,7 @@ function fakeBridge(overrides: Partial<TeleportBridge> = {}): TeleportBridge {remoteWindowThumbnail: async () => null,streamRemoteWindow: vi.fn(async () => {}),openPicker: async () => {},- pickerConfig: async () => ({ spaceId: "cloud:aurora", spaceName: "Aurora", app: null }),+ pickerConfig: async () => ({ spaceId: "direct:aurora", spaceName: "Aurora", app: null }),closePicker: async () => {},...overrides,};@@ -121,7 +121,7 @@ describe("TeleportPicker window tabs", () => {fireEvent.click(screen.getByRole("button", { name: "Stream to This Mac" }));await waitFor(() =>- expect(streamRemoteWindow).toHaveBeenCalledWith("cloud:aurora", "Aurora", "w-2", "Terminal", "bash", false),+ expect(streamRemoteWindow).toHaveBeenCalledWith("direct:aurora", "Aurora", "w-2", "Terminal", "bash", false),);await waitFor(() => expect(closePicker).toHaveBeenCalled());});@@ -155,7 +155,7 @@ describe("TeleportPicker window tabs", () => {const card = await openTab(/From Aurora/, /Cua — Docs/);expect(card.querySelector("img.hp-card-img")).toBeNull();- await waitFor(() => expect(remoteWindowThumbnail).toHaveBeenCalledWith("cloud:aurora", "w-1", 1));+ await waitFor(() => expect(remoteWindowThumbnail).toHaveBeenCalledWith("direct:aurora", "w-1", 1));await waitFor(() => expect(spaceAppIcons).toHaveBeenCalledTimes(1));expect(spaceAppIcons.mock.calls[0]![1]).toEqual([{ appName: "Firefox", appId: "firefox", pid: 0 },@@ -175,7 +175,7 @@ describe("TeleportPicker window tabs", () => {fireEvent.keyDown(pick, { key: "ArrowRight" });await waitFor(() => expect(screen.getByRole("option", { name: /bash/ })).toHaveAttribute("aria-selected", "true"));fireEvent.keyDown(pick, { key: "Enter" });- await waitFor(() => expect(streamRemoteWindow).toHaveBeenCalledWith("cloud:aurora", "Aurora", "w-2", "Terminal", "bash", false));+ await waitFor(() => expect(streamRemoteWindow).toHaveBeenCalledWith("direct:aurora", "Aurora", "w-2", "Terminal", "bash", false));});});@@ -184,7 +184,7 @@ function recordingHost(): TeleportHost & { runs: unknown[] } {const runs: unknown[] = [];const secretPlan = (entry: ReturnType<typeof entryFromCore>): Plan => ({app: entry,- spaceId: "cloud:aurora",+ spaceId: "direct:aurora",moves: "app_with_state",relayUnsealed: false,steps: [{ kind: "state", summary: "Import 1 firefox item(s)" }],@@ -271,7 +271,7 @@ describe("TeleportPicker: Teleport an app", () => {it("opens straight on a preselected app from a drop, with its files", async () => {const bridge = fakeBridge({pickerConfig: async () => ({- spaceId: "cloud:aurora",+ spaceId: "direct:aurora",spaceName: "Aurora",app: null,entry: JSON.parse(FIXTURE_CATALOG[1]!.json),diff --git a/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx b/apps/cua-spaces/src/components/ThisMachinePanel.test.tsxindex 4baf53f090..14f29f94cb 100644--- a/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx+++ b/apps/cua-spaces/src/components/ThisMachinePanel.test.tsx@@ -20,7 +20,7 @@ import { notchActivity } from "../model/notch";import { rowToSpace } from "../model/spaces";import { createFallbackBridge } from "../native/bridge";import { createFakeHostBridge, unconfiguredStatus, type HostStatus } from "../native/host";-import { fakeFleetBridge } from "../test/fakeFleet";+import { fakeSpacesBridge } from "../test/fakeSpacesBridge";import { ThisMachinePanel } from "./ThisMachinePanel";const sharing: HostStatus = {@@ -87,7 +87,6 @@ describe("host model", () => {);expect(space.provider).toBe("relay");expect(space.detail).toBe("My computers · via relay");- expect(space.fleetId).toBe("relay");});});@@ -217,7 +216,7 @@ describe("roster", () => {it("always lists This machine in the live roster, next to relay machines", async () => {const user = userEvent.setup();const host = createFakeHostBridge({ status: sharing, onboarding: { completed: true } });- const fleet = fakeFleetBridge({+ const spacesBridge = fakeSpacesBridge({isNative: true,listSpaces: async () => [{@@ -231,7 +230,7 @@ describe("roster", () => {},],});- render(<App bridge={createFallbackBridge("notched")} fleet={fleet} host={host} now={() => FIXTURE_NOW} />);+ render(<App bridge={createFallbackBridge("notched")} spacesBridge={spacesBridge} host={host} now={() => FIXTURE_NOW} />);await user.click(await screen.findByRole("button", { name: /Spaces/ }));const listbox = await screen.findByRole("listbox");await waitFor(() => {diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsxindex a31bd615f8..a962795ff7 100644--- a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx+++ b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx@@ -8,9 +8,9 @@ import { describe, expect, it, vi } from "vitest";import type { SpaceRow } from "../../model/spaces";import { createFakeHostBridge } from "../../native/host";import { createFakeInstallerBridge } from "../../native/installer";-import type { CreateProgress, SpaceCreateConfig } from "../../native/fleet";+import type { CreateProgress, SpaceCreateConfig } from "../../native/spacesBridge";import type { LocalStatus } from "../../native/local";-import { fakeFleetBridge } from "../../test/fakeFleet";+import { fakeSpacesBridge } from "../../test/fakeSpacesBridge";import { MainWindow } from "./MainWindow";import { createFakeCloudBridge, type CloudBridge } from '../../native/cloud';@@ -18,35 +18,33 @@ import { createFakeCloudBridge, type CloudBridge } from '../../native/cloud';const GENERATED = /space-[0-9a-f]{10}/;const ROWS: SpaceRow[] = [- { id: "cloud:aurora", name: "aurora", provider: "cloud", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: true },+ { id: "relay:aurora", name: "aurora", provider: "relay", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: true },{ id: "local:cua-e2e-vm", name: "cua-e2e-vm", provider: "local", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: true },];const LOCAL: LocalStatus = { available: true, backends: ["container", "qemu"], containerImage: "", macosImage: null, error: null };function setup(- overrides: Parameters<typeof fakeFleetBridge>[0] = {},+ overrides: Parameters<typeof fakeSpacesBridge>[0] = {},onboarded = true,cloud: CloudBridge = createFakeCloudBridge(),strict = false,) {- const createSpace = vi.fn(async (config?: SpaceCreateConfig) => (config?.on === "cloud" ? ROWS[0]! : ROWS[1]!));- const setDefaultLocation = vi.fn(async (on: "local" | "cloud") => ({ value: on, source: "config" as const, path: "/tmp/cua/config.toml" }));- const fleet = fakeFleetBridge({+ const createSpace = vi.fn(async (config?: SpaceCreateConfig) => (config?.on === "yours" ? ROWS[0]! : ROWS[1]!));+ const bridge = fakeSpacesBridge({isNative: true,listSpaces: async () => ROWS,localStatus: async () => LOCAL,status: async () => ({ configured: true, authMode: "user", identity: "[email protected]" }),screenshot: async () => "data:image/png;base64,AAAA",createSpace,- setDefaultLocation,...overrides,});const host = createFakeHostBridge({ onboarding: { completed: onboarded, mode: onboarded ? "client" : null } });const installer = createFakeInstallerBridge({ plan: { installed: true, upToDate: true, onPath: true } });- const tree = <MainWindow fleet={fleet} host={host} installer={installer} cloud={cloud} now={() => 1_000} />;+ const tree = <MainWindow bridge={bridge} host={host} installer={installer} cloud={cloud} now={() => 1_000} />;render(strict ? <StrictMode>{tree}</StrictMode> : tree);- return { fleet, host, installer, createSpace, setDefaultLocation };+ return { bridge, host, installer, createSpace };}describe("MainWindow", () => {@@ -65,13 +63,13 @@ describe("MainWindow", () => {await screen.findByText("Just use this Mac to open my other computers");fireEvent.click(screen.getByRole("button", { name: "Continue" }));fireEvent.click(await screen.findByRole("button", { name: "Start using Cua Spaces" }));- expect(await screen.findByRole("listbox", { name: "Cua Cloud" })).toBeInTheDocument();+ expect(await screen.findByRole("listbox", { name: "My computers" })).toBeInTheDocument();expect(host.state.onboarding).toMatchObject({ completed: true, mode: "client" });});it("lists Spaces by where they run, with This machine first", async () => {setup();- const cloud = await screen.findByRole("listbox", { name: "Cua Cloud" });+ const cloud = await screen.findByRole("listbox", { name: "My computers" });expect(within(cloud).getByRole("option", { name: /aurora/ })).toBeInTheDocument();expect(within(screen.getByRole("listbox", { name: "This Mac" })).getByRole("option", { name: /cua-e2e-vm/ })).toBeInTheDocument();expect(within(screen.getByRole("listbox", { name: "This computer" })).getByRole("option")).toBeInTheDocument();@@ -88,7 +86,7 @@ describe("MainWindow", () => {expect(await screen.findByRole("heading", { level: 1, name: "aurora" })).toBeInTheDocument();expect(await screen.findByAltText("aurora desktop")).toHaveAttribute("src", "data:image/png;base64,AAAA");// The facts are the core's: no Location row (the sidebar section says where it runs).- expect(screen.getByLabelText("Details")).toHaveTextContent("cloud:aurora");+ expect(screen.getByLabelText("Details")).toHaveTextContent("relay:aurora");expect(screen.getByLabelText("Details")).not.toHaveTextContent("Cua Cloud");});@@ -160,7 +158,7 @@ describe("MainWindow", () => {});it("Run on starts on this Mac even with a cloud default", async () => {const { createSpace } = setup({- defaultLocation: async () => ({ value: "cloud", source: "config", path: "/tmp/cua/config.toml" }),+ defaultLocation: async () => ({ value: "aws", source: "config", path: "/tmp/cua/config.toml" }),});await screen.findByRole("option", { name: /aurora/ });fireEvent.click(await screen.findByRole("button", { name: "New Space" }));@@ -249,7 +247,7 @@ describe("MainWindow", () => {/** Starts a local create from the wizard; resolves with its pending id and* the progress handlers. */- async function startPendingCreate(overrides: Parameters<typeof fakeFleetBridge>[0]) {+ async function startPendingCreate(overrides: Parameters<typeof fakeSpacesBridge>[0]) {let pendingId = "";let settle: { resolve: (row: SpaceRow) => void; reject: (e: Error) => void } | null = null;const progress: ((p: CreateProgress) => void)[] = [];@@ -376,8 +374,8 @@ describe("MainWindow", () => {it("the toolbar is the core's, in order, and This machine has its own page", async () => {setup();- fireEvent.click(await screen.findByRole("option", { name: /aurora/ }));- await screen.findByRole("heading", { level: 1, name: "aurora" });+ fireEvent.click(await screen.findByRole("option", { name: /cua-e2e-vm/ }));+ await screen.findByRole("heading", { level: 1, name: "cua-e2e-vm" });const labels = [...document.querySelectorAll(".dw-toolbar-actions button")].map((b) => b.getAttribute("aria-label") ?? b.textContent,);@@ -409,14 +407,14 @@ describe("MainWindow", () => {});it("deleting a Space asks first", async () => {- const deleteSpace = vi.fn(async () => "Deleted cloud:aurora");+ const deleteSpace = vi.fn(async () => "Deleted local:cua-e2e-vm");setup({ deleteSpace });- fireEvent.click(await screen.findByRole("option", { name: /aurora/ }));+ fireEvent.click(await screen.findByRole("option", { name: /cua-e2e-vm/ }));fireEvent.click(await screen.findByRole("button", { name: "Delete Space" }));expect(deleteSpace).not.toHaveBeenCalled();- expect(screen.getByRole("alertdialog", { name: "Delete aurora?" })).toHaveTextContent("Everything inside it, including its files, is deleted and can't be recovered.");+ expect(screen.getByRole("alertdialog", { name: "Delete cua-e2e-vm?" })).toHaveTextContent("Everything inside it, including its files, is deleted and can't be recovered.");fireEvent.click(screen.getAllByRole("button", { name: "Delete Space" }).at(-1)!);- await waitFor(() => expect(deleteSpace).toHaveBeenCalledWith("cloud:aurora"));+ await waitFor(() => expect(deleteSpace).toHaveBeenCalledWith("local:cua-e2e-vm"));});it("a Space in your cloud shows where it runs and offers Delete Permanently or Remove from List", async () => {@@ -455,7 +453,7 @@ describe("MainWindow", () => {let finish: (v: string) => void = () => {};const deleteSpace = vi.fn(() => new Promise<string>((resolve) => (finish = resolve)));setup({ deleteSpace });- fireEvent.click(await screen.findByRole("option", { name: /aurora/ }));+ fireEvent.click(await screen.findByRole("option", { name: /cua-e2e-vm/ }));fireEvent.click(await screen.findByRole("button", { name: "Delete Space" }));fireEvent.click(screen.getAllByRole("button", { name: "Delete Space" }).at(-1)!);await waitFor(() => expect(deleteSpace).toHaveBeenCalledTimes(1));@@ -465,8 +463,8 @@ describe("MainWindow", () => {expect(again).toBeDisabled();fireEvent.click(again);expect(deleteSpace).toHaveBeenCalledTimes(1);- finish("Deleted cloud:aurora");- await waitFor(() => expect(screen.queryByRole("option", { name: /aurora/ })).not.toBeInTheDocument());+ finish("Deleted local:cua-e2e-vm");+ await waitFor(() => expect(screen.queryByRole("option", { name: /cua-e2e-vm/ })).not.toBeInTheDocument());});it("the power button next to Delete suspends, waits, and shows a failure inline", async () => {@@ -485,7 +483,7 @@ describe("MainWindow", () => {const labels = [...toolbar.querySelectorAll("button")].map((b) => b.getAttribute("aria-label") ?? b.textContent);expect(labels).toEqual(["Teleport an app", "Picture in picture", "Share", "Suspend", "Delete Space", "Open"]);expect(screen.getAllByRole("button", { name: "Suspend" })).toHaveLength(2);- // aurora (cloud) cannot be turned off: no power button on its row.+ // aurora (a relay machine) cannot be turned off: no power button on its row.expect(document.querySelectorAll(".dw-row-power")).toHaveLength(1);fireEvent.click(screen.getAllByRole("button", { name: "Suspend" })[0]!);@@ -538,8 +536,8 @@ describe("MainWindow launch at login", () => {window.localStorage.clear();const loginItem = fakeLoginItemBridge("notRegistered");const host = await spareHost();- const fleet = fakeFleetBridge({ isNative: true, listSpaces: async () => ROWS, localStatus: async () => LOCAL });- render(<MainWindow fleet={fleet} host={host} installer={createFakeInstallerBridge()} loginItem={loginItem} now={() => 1_000} />);+ const bridge = fakeSpacesBridge({ isNative: true, listSpaces: async () => ROWS, localStatus: async () => LOCAL });+ render(<MainWindow bridge={bridge} host={host} installer={createFakeInstallerBridge()} loginItem={loginItem} now={() => 1_000} />);await waitFor(() => expect(loginItem.calls).toEqual([true]));expect(readLaunchChoice()).toBe(true);});@@ -552,8 +550,8 @@ describe("MainWindow launch at login", () => {const loginItem = fakeLoginItemBridge("notRegistered");const statusRead = vi.spyOn(loginItem, "status");const host = await spareHost();- const fleet = fakeFleetBridge({ isNative: true, listSpaces: async () => ROWS, localStatus: async () => LOCAL });- render(<MainWindow fleet={fleet} host={host} installer={createFakeInstallerBridge()} loginItem={loginItem} now={() => 1_000} />);+ const bridge = fakeSpacesBridge({ isNative: true, listSpaces: async () => ROWS, localStatus: async () => LOCAL });+ render(<MainWindow bridge={bridge} host={host} installer={createFakeInstallerBridge()} loginItem={loginItem} now={() => 1_000} />);await waitFor(() => expect(statusRead).toHaveBeenCalled());await act(async () => {});expect(loginItem.calls).toEqual([]);diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.tsxindex 3aa1ffa5b7..a10596fae1 100644--- a/apps/cua-spaces/src/components/desktop/MainWindow.tsx+++ b/apps/cua-spaces/src/components/desktop/MainWindow.tsx@@ -21,10 +21,10 @@ import {import { createFileSendBridge, type FileSendBridge } from '../../native/fileSend';import {type GpuChoice,- createFleetBridge,- type FleetBridge,+ createSpacesBridge,+ type SpacesBridge,type ViewerWindowRequest,-} from '../../native/fleet';+} from '../../native/spacesBridge';import { createTeleportBridge, type TeleportBridge } from '../../native/teleport';import {createHostBridge,@@ -45,7 +45,7 @@ import { hasFeature } from '../../model/spaces';import { canRunContainer, canRunMacos, type LocalStatus } from '../../native/local';import { createWindowDragBridge, type WindowDragBridge } from '../../native/windowDrag';import type { PortalAction } from '../../state/portal';-import { useFleetSync } from '../../state/cloud';+import { useSpacesSync } from '../../state/cloud';import { createFromPlan } from '../../state/createSpace';import { RadialProgress } from '../RadialProgress';import { InstallerFlow } from '../InstallerFlow';@@ -80,7 +80,7 @@ import { Sym } from './Sym';import { tMsg, useT } from "../../i18n";export interface MainWindowProps {- fleet?: FleetBridge;+ bridge?: SpacesBridge;host?: HostBridge;installer?: InstallerBridge;teleport?: TeleportBridge;@@ -134,7 +134,7 @@ function detailOf(* it works whether or not the notch portal is open.*/export function MainWindow({- fleet: fleetProp,+ bridge: bridgeProp,host: hostProp,installer: installerProp,teleport: teleportProp,@@ -152,7 +152,7 @@ export function MainWindow({}: MainWindowProps) {const t = useT("spaces");const tc = useT("common");- const fleet = useMemo(() => fleetProp ?? createFleetBridge(), [fleetProp]);+ const bridge = useMemo(() => bridgeProp ?? createSpacesBridge(), [bridgeProp]);const host = useMemo(() => hostProp ?? createHostBridge(), [hostProp]);const installer = useMemo(() => installerProp ?? createInstallerBridge(), [installerProp]);const teleport = useMemo(() => teleportProp ?? createTeleportBridge(), [teleportProp]);@@ -173,13 +173,13 @@ export function MainWindow({const postNotification = useCallback((title: string, body: string) => devicesBridge.notify(title, body), [devicesBridge]);const feed = useAgentNotifications(agentsBridge, postNotification);const [sharing, setSharing] = useState<Space | null>(null);- const live = fleet.isNative;+ const live = bridge.isNative;const [spaces, setSpaces] = useState<Space[]>(live ? [] : FIXTURE_SPACES);const dispatch = useCallback((action: PortalAction) => {if (action.type === 'sync-spaces') setSpaces(action.spaces);}, []);- const sync = useFleetSync(fleet, dispatch, now);+ const sync = useSpacesSync(bridge, dispatch, now);// Devices: read quietly while signed in; a device asking for approval// posts a notification and opens the approval sheet.const devices = useDevices(devicesBridge, Boolean(sync.identity), now);@@ -208,13 +208,13 @@ export function MainWindow({for (const off of offs) off();fn();};- void fleet.onSignedIn(() => done(resolve)).then((off) => offs.push(off));- void fleet+ void bridge.onSignedIn(() => done(resolve)).then((off) => offs.push(off));+ void bridge.onSignInFailed((reason) => done(() => reject(new Error(reason)))).then((off) => offs.push(off));- fleet.beginSignIn().catch((e: unknown) => done(() => reject(e)));+ bridge.beginSignIn().catch((e: unknown) => done(() => reject(e)));}),- [fleet]+ [bridge]);const [onboarding, setOnboarding] = useState<OnboardingState | null>(@@ -336,41 +336,41 @@ export function MainWindow({useEffect(() => {if (!live) return;let cancelled = false;- void fleet+ void bridge.localStatus().then((next) => !cancelled && setLocal(next)).catch(() => {});return () => {cancelled = true;};- }, [fleet, live, wizard]);+ }, [bridge, live, wizard]);// The GPU option of each local runtime, each time New Space opens.useEffect(() => {- if (!live || !wizard || !fleet.gpuSupport) return;+ if (!live || !wizard || !bridge.gpuSupport) return;let cancelled = false;- void fleet+ void bridge.gpuSupport().then((next) => !cancelled && setGpus(next)).catch(() => {});return () => {cancelled = true;};- }, [fleet, live, wizard]);+ }, [bridge, live, wizard]);// Your machines that provide Spaces (the Run on menu), each time New// Space opens.useEffect(() => {- if (!live || !wizard || !fleet.listHosts) return;+ if (!live || !wizard || !bridge.listHosts) return;let cancelled = false;- void fleet+ void bridge.listHosts().then((next) => !cancelled && setHosts(next)).catch(() => {});return () => {cancelled = true;};- }, [fleet, live, wizard]);+ }, [bridge, live, wizard]);// The shell (the notch's list button, the Dock) can ask for a Space or the// New Space sheet.@@ -437,8 +437,6 @@ export function MainWindow({// experiment on (the core's `volumeLabel`); off, it shows the Spaces.const volumeShown = Boolean(chrome.volumeLabel);- // Cua Cloud has ended: it is never an available location.- const cloudAvailable = false;const localAvailable = live ? canRunContainer(local) || canRunMacos(local) : true;const startCreate = useCallback(@@ -452,7 +450,7 @@ export function MainWindow({.then((id) => {setSelectedId((current) => (current === pendingId ? id : current));if (plan.openDesktop) {- void fleet.openSpaceWindow({+ void bridge.openSpaceWindow({id,name: plan.name || plan.image.name,controller: 'you',@@ -464,7 +462,7 @@ export function MainWindow({// The row says why (the core's pending row keeps the error).});},- [fleet, sync, openSpace]+ [bridge, sync, openSpace]);// The power button: the row says Suspending (and the like) at once; a@@ -494,13 +492,13 @@ export function MainWindow({);const signIn = useCallback(() => {- fleet.beginSignIn().catch((error: unknown) => {+ bridge.beginSignIn().catch((error: unknown) => {setBanner({tone: 'error',text: `Sign-in failed: ${error instanceof Error ? error.message : String(error)}`,});});- }, [fleet]);+ }, [bridge]);if (onboarding && !onboarding.completed) {return (@@ -513,17 +511,17 @@ export function MainWindow({drive={driveBridge}loginItem={loginItem}auth={- fleet.isNative+ bridge.isNative? {- beginSignIn: fleet.beginSignIn,- onSignedIn: fleet.onSignedIn,- onSignInFailed: fleet.onSignInFailed,+ beginSignIn: bridge.beginSignIn,+ onSignedIn: bridge.onSignedIn,+ onSignInFailed: bridge.onSignInFailed,}: undefined}installerMode={onboarding.installerMode}identity={sync.identity}- onOpenExternal={(url) => void fleet.openExternal(url).catch(() => {})}+ onOpenExternal={(url) => void bridge.openExternal(url).catch(() => {})}initialStep={startView === 'onboarding-done'? 'done'@@ -558,10 +556,10 @@ export function MainWindow({const runAction = (id: DetailActionId, space: Space) => {switch (id) {case 'teleport':- void fleet.openTeleportPicker(viewerRequest(space));+ void bridge.openTeleportPicker(viewerRequest(space));break;case 'pip':- void fleet.pinSpacePip(viewerRequest(space));+ void bridge.pinSpacePip(viewerRequest(space));break;case 'share':setSharing(space);@@ -575,7 +573,7 @@ export function MainWindow({setConfirmDelete(space.id);break;case 'open':- void fleet.openSpaceWindow(viewerRequest(space));+ void bridge.openSpaceWindow(viewerRequest(space));break;case 'cancel':// The row shows Cancelling, then goes (or says why the cancel failed).@@ -783,14 +781,14 @@ export function MainWindow({signedIn={Boolean(sync.identity)}shareable={sharing.id.startsWith('relay:') || hasFeature(sharing, 'relay_attach')}onClose={() => setSharing(null)}- onOpenExternal={(url) => void fleet.openExternal(url).catch(() => {})}+ onOpenExternal={(url) => void bridge.openExternal(url).catch(() => {})}/>)}<ShareRemovalBannerbridge={shareBridge}signedIn={Boolean(sync.identity)}- onOpenExternal={(url) => void fleet.openExternal(url).catch(() => {})}+ onOpenExternal={(url) => void bridge.openExternal(url).catch(() => {})}/>{sync.rosterError && (@@ -831,20 +829,17 @@ export function MainWindow({}}signedInIdentity={sync.identity}auth={- fleet.isNative+ bridge.isNative? {- beginSignIn: () => fleet.beginSignIn(),- signOut: () => fleet.signOut(),- onSignedIn: (h) => fleet.onSignedIn(h),- onSignInFailed: (h) => fleet.onSignInFailed(h),- onSignedOut: (h) => fleet.onSignedOut(h),+ beginSignIn: () => bridge.beginSignIn(),+ signOut: () => bridge.signOut(),+ onSignedIn: (h) => bridge.onSignedIn(h),+ onSignInFailed: (h) => bridge.onSignInFailed(h),+ onSignedOut: (h) => bridge.onSignedOut(h),}: undefined}- onOpenExternal={(url) => void fleet.openExternal(url).catch(() => {})}- defaultLocation={live ? sync.defaultLocation : undefined}- onDefaultLocation={sync.setDefaultLocation}- billingStatus={fleet.billingStatus}+ onOpenExternal={(url) => void bridge.openExternal(url).catch(() => {})}drive={driveBridge}loginItem={loginItem}serves={serves}@@ -910,7 +905,7 @@ export function MainWindow({key={selected.id}space={selected}detail={detail!}- fleet={fleet}+ bridge={bridge}teleport={teleport}fileSend={fileSend}windowDrag={windowDrag}@@ -941,14 +936,13 @@ export function MainWindow({hosts={hosts}experiments={experiments}onConnectCloud={() => setConnectingCloud(true)}- cloudAvailable={cloudAvailable}localAvailable={localAvailable}localReason={local?.error ?? undefined}localBackends={live ? (local?.backends ?? []) : undefined}hostArch={sync.hostArch ?? local?.hostArch}storage={live ? local?.storage : undefined}gpus={live ? gpus : null}- onOpenExternal={(url) => void fleet.openExternal(url).catch(() => {})}+ onOpenExternal={(url) => void bridge.openExternal(url).catch(() => {})}startActions={startActions}quick={typeof wizard === 'string' ? wizard : undefined}onCreate={startCreate}@@ -1128,7 +1122,7 @@ function SpaceRowItem({function SpaceDetail({space,detail,- fleet,+ bridge,teleport,fileSend,windowDrag,@@ -1136,7 +1130,7 @@ function SpaceDetail({}: {space: Space;detail: SpaceDetailView;- fleet: FleetBridge;+ bridge: SpacesBridge;teleport: TeleportBridge;fileSend: FileSendBridge;windowDrag: WindowDragBridge;@@ -1151,7 +1145,7 @@ function SpaceDetail({alive.current = true;if (!space.sdk || !reachable) return;const grab = () =>- fleet+ bridge.screenshot(space.id, 1280).then((url) => alive.current && setShot(url)).catch(() => {});@@ -1161,7 +1155,7 @@ function SpaceDetail({alive.current = false;window.clearInterval(timer);};- }, [fleet, space.id, space.sdk, reachable]);+ }, [bridge, space.id, space.sdk, reachable]);const section = (title: string) => {switch (title) {@@ -1171,8 +1165,8 @@ function SpaceDetail({<SpaceWindowListspace={space}teleport={teleport}- onPipDesktop={() => void fleet.pinSpacePip(viewerRequest(space))}- onClosePipDesktop={() => void fleet.unpinSpacePip(space.id).catch(() => {})}+ onPipDesktop={() => void bridge.pinSpacePip(viewerRequest(space))}+ onClosePipDesktop={() => void bridge.unpinSpacePip(space.id).catch(() => {})}onPipWindow={(win, options) =>void teleport.streamRemoteWindow(@@ -1201,7 +1195,7 @@ function SpaceDetail({spaceName={space.name}fileSend={fileSend}windowDrag={windowDrag}- onTeleportApp={() => void fleet.openTeleportPicker(viewerRequest(space))}+ onTeleportApp={() => void bridge.openTeleportPicker(viewerRequest(space))}/>);default:@@ -1219,17 +1213,6 @@ function SpaceDetail({<Sym name="desktopcomputer" /><span>{detail.previewText}</span></div>- ) : detail.creditNotice ? (- <div className="dw-preview-empty" role="alert">- <span>{detail.creditNotice.text}</span>- <button- type="button"- className="dw-btn dw-btn-primary"- onClick={() => void fleet.openExternal(detail.creditNotice!.url).catch(() => {})}- >- {detail.creditNotice.button}- </button>- </div>) : space.progress?.error ? (<div className="dw-preview-empty"><span>{detail.previewText}</span>diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.volume.test.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.volume.test.tsxindex d23bf334ac..ab719c0ec9 100644--- a/apps/cua-spaces/src/components/desktop/MainWindow.volume.test.tsx+++ b/apps/cua-spaces/src/components/desktop/MainWindow.volume.test.tsx@@ -7,7 +7,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";import { createFakeHostBridge } from "../../native/host";import { createFakeInstallerBridge } from "../../native/installer";import { createAgentsBridgeOver } from "../../native/persistent";-import { fakeFleetBridge } from "../../test/fakeFleet";+import { fakeSpacesBridge } from "../../test/fakeSpacesBridge";import { MainWindow } from "./MainWindow";/** The shell's events, as the main window listens to them. */@@ -21,7 +21,7 @@ vi.mock("@tauri-apps/api/event", () => ({}));function setup() {- const fleet = fakeFleetBridge({+ const bridge = fakeSpacesBridge({isNative: true,listSpaces: async () => [],status: async () => ({ configured: true, authMode: "user", identity: "[email protected]" }),@@ -35,7 +35,7 @@ function setup() {});render(<MainWindow- fleet={fleet}+ bridge={bridge}host={host}installer={createFakeInstallerBridge({ plan: { installed: true, upToDate: true, onPath: true } })}agents={agents}@@ -58,7 +58,7 @@ describe("MainWindow and the menu bar item", () => {it("opens the Volume page for Cua Volume's conflicts (main:volume)", async () => {window.localStorage.setItem("cua.settings.experiments", JSON.stringify({ cuaVolume: true }));- const fleet = fakeFleetBridge({+ const bridge = fakeSpacesBridge({isNative: true,listSpaces: async () => [],status: async () => ({ configured: true, authMode: "user", identity: "[email protected]" }),@@ -72,7 +72,7 @@ describe("MainWindow and the menu bar item", () => {});render(<MainWindow- fleet={fleet}+ bridge={bridge}host={host}installer={createFakeInstallerBridge({ plan: { installed: true, upToDate: true, onPath: true } })}agents={agents}diff --git a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsxindex 05875c9662..1399940cfb 100644--- a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx+++ b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx@@ -18,7 +18,6 @@ import {function renderWizard(overrides: Partial<NewSpaceWizardProps> = {}) {const props: NewSpaceWizardProps = {- cloudAvailable: true,localAvailable: true,onCreate: vi.fn(),onAddByAddress: vi.fn(async () => {}),@@ -494,7 +493,6 @@ describe("QEMU VMs", () => {describe("default placement", () => {it("starts on This Mac when not signed in but a local runtime is ready, even if that is known late", () => {const props: NewSpaceWizardProps = {- cloudAvailable: false,localAvailable: false,onCreate: vi.fn(),onAddByAddress: vi.fn(async () => {}),diff --git a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsxindex 4c6b547c8e..e9ac8e5edd 100644--- a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx+++ b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx@@ -7,7 +7,7 @@ import { core } from "../../core";import { NO_EXPERIMENTS, type Experiments } from "../../model/experiments";import type { Placement, SandboxImage } from "../../model/images";import type { Runtime } from "../../model/types";-import type { CloudPricing, GpuChoice } from "../../native/fleet";+import type { GpuChoice } from "../../native/spacesBridge";import type { LocalStorage } from "../../native/local";import { telemetryBridge, type TelemetryBridge } from "../../native/telemetry";import { hostOs } from "../../model/host";@@ -44,8 +44,6 @@ export interface NewSpaceWizardProps {/** Where "Run on" starts: the configured default location (Settings,* `cua config set default.on`). */defaultLocation?: Placement;- /** Cua Cloud has ended: the app passes `false`. */- cloudAvailable: boolean;/** Local needs a container backend (docker / runsc) or Lume. */localAvailable: boolean;/** Why local is unavailable, shown on the disabled tile. */@@ -67,8 +65,6 @@ export interface NewSpaceWizardProps {hostArch?: string;/** Free space where local Spaces are written, and what is pulled. */storage?: LocalStorage | null;- /** Cua Cloud rates (always none: it has ended). */- cloudPricing?: CloudPricing | null;/** The GPU option of each runtime that has one (`gpu_support`); a* runtime not listed gets no GPU row. */gpus?: readonly GpuChoice[] | null;@@ -251,7 +247,6 @@ interface GpuRow {*/export function NewSpaceWizard({defaultLocation = "local",- cloudAvailable,localAvailable,localReason,localBackends,@@ -262,7 +257,6 @@ export function NewSpaceWizard({maxCpus = Math.max(2, Math.min(16, globalThis.navigator?.hardwareConcurrency || 8)),hostArch,storage,- cloudPricing,gpus,onOpenExternal,startActions,@@ -276,14 +270,12 @@ export function NewSpaceWizard({const env = useMemo(() => ({defaultLocation,- cloudAvailable,- localAvailable,+ localAvailable,localReason: localReason ?? null,localBackends: localBackends ? [...localBackends] : null,maxCpus,hostArch: hostArch ?? null,storage: storage ?? null,- cloudPricing: cloudPricing ?? null,clouds: clouds ? [...clouds] : [],hosts: hosts ? [...hosts] : [],experiments: experiments ?? NO_EXPERIMENTS,@@ -291,15 +283,13 @@ export function NewSpaceWizard({}),[defaultLocation,- cloudAvailable,- localAvailable,+ localAvailable,localReason,localBackends,maxCpus,hostArch,storage,- cloudPricing,- clouds,+ clouds,hosts,experiments,gpus,diff --git a/apps/cua-spaces/src/devtools/agentsShot.tsx b/apps/cua-spaces/src/devtools/agentsShot.tsxindex 704b5654cc..4241c53626 100644--- a/apps/cua-spaces/src/devtools/agentsShot.tsx+++ b/apps/cua-spaces/src/devtools/agentsShot.tsx@@ -28,7 +28,7 @@ import { MainWindow } from "../components/desktop/MainWindow";import type { SpaceAgentRun } from "../model/agents";import type { RemoteWindow } from "../model/teleport";import type { TeleportBridge } from "../native/teleport";-import { fakeFleetBridge } from "../test/fakeFleet";+import { fakeSpacesBridge } from "../test/fakeSpacesBridge";import "../styles/tokens.css";import "../styles/app.css";import "../styles/desktop.css";@@ -111,7 +111,7 @@ const teleport = {},} as unknown as TeleportBridge;-const fleet = fakeFleetBridge({+const bridge = fakeSpacesBridge({isNative: true,listSpaces: async () => [{@@ -123,15 +123,15 @@ const fleet = fakeFleetBridge({os: "macos",reachable: true,},- { id: "cloud:aurora", name: "aurora", provider: "cloud", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: true },- { id: "cloud:orion", name: "orion", provider: "cloud", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: false },+ { id: "direct:aurora", name: "aurora", provider: "direct", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: true },+ { id: "direct:orion", name: "orion", provider: "direct", spacesdVersion: "0.4.0", features: [], os: "linux", reachable: false },],status: async () => ({ configured: true, authMode: "user", identity: "[email protected]" }),});const host = document.getElementById("root");if (host) {- createRoot(host).render(<MainWindow fleet={fleet} teleport={teleport} />);+ createRoot(host).render(<MainWindow bridge={bridge} teleport={teleport} />);// Open the Space the way a user does, by clicking its row.const open = () => {const row = Array.from(host.querySelectorAll<HTMLButtonElement>('[role="option"]')).find((el) =>diff --git a/apps/cua-spaces/src/i18n/i18n.lock.json b/apps/cua-spaces/src/i18n/i18n.lock.jsonindex df095aefa0..82f5f08334 100644--- a/apps/cua-spaces/src/i18n/i18n.lock.json+++ b/apps/cua-spaces/src/i18n/i18n.lock.json@@ -64,7 +64,6 @@"spaces.power.turn_on": "5a1f096a0d8d","spaces.sidebar.empty": "3cb8c0f1b397","spaces.sidebar.no_matches": "2df01a03ff43",- "spaces.sidebar.section.cloud": "248b5c8fbc7f","spaces.sidebar.section.connected": "22965568d22a","spaces.sidebar.section.my_computers": "90fd7e891731","spaces.sidebar.section.this_mac": "79a4aefc396f",@@ -243,7 +242,6 @@"spaces.power.turn_on": "5a1f096a0d8d","spaces.sidebar.empty": "3cb8c0f1b397","spaces.sidebar.no_matches": "2df01a03ff43",- "spaces.sidebar.section.cloud": "248b5c8fbc7f","spaces.sidebar.section.connected": "22965568d22a","spaces.sidebar.section.my_computers": "90fd7e891731","spaces.sidebar.section.this_mac": "79a4aefc396f",@@ -422,7 +420,6 @@"spaces.power.turn_on": "5a1f096a0d8d","spaces.sidebar.empty": "3cb8c0f1b397","spaces.sidebar.no_matches": "2df01a03ff43",- "spaces.sidebar.section.cloud": "248b5c8fbc7f","spaces.sidebar.section.connected": "22965568d22a","spaces.sidebar.section.my_computers": "90fd7e891731","spaces.sidebar.section.this_mac": "79a4aefc396f",@@ -601,7 +598,6 @@"spaces.power.turn_on": "5a1f096a0d8d","spaces.sidebar.empty": "3cb8c0f1b397","spaces.sidebar.no_matches": "2df01a03ff43",- "spaces.sidebar.section.cloud": "248b5c8fbc7f","spaces.sidebar.section.connected": "22965568d22a","spaces.sidebar.section.my_computers": "90fd7e891731","spaces.sidebar.section.this_mac": "79a4aefc396f",@@ -780,7 +776,6 @@"spaces.power.turn_on": "5a1f096a0d8d","spaces.sidebar.empty": "3cb8c0f1b397","spaces.sidebar.no_matches": "2df01a03ff43",- "spaces.sidebar.section.cloud": "248b5c8fbc7f","spaces.sidebar.section.connected": "22965568d22a","spaces.sidebar.section.my_computers": "90fd7e891731","spaces.sidebar.section.this_mac": "79a4aefc396f",diff --git a/apps/cua-spaces/src/i18n/locales/en/spaces.json b/apps/cua-spaces/src/i18n/locales/en/spaces.jsonindex e887993bcc..5f9d965793 100644--- a/apps/cua-spaces/src/i18n/locales/en/spaces.json+++ b/apps/cua-spaces/src/i18n/locales/en/spaces.json@@ -61,7 +61,6 @@"spaces.window_stream.no_windows": "No open windows in {name} yet.","spaces.window_stream.close_window": "Close window","spaces.create.creating": "Creating a Space…",- "spaces.sidebar.section.cloud": "Cua Cloud","spaces.sidebar.section.this_mac": "This Mac","spaces.sidebar.section.connected": "Connected","spaces.sidebar.section.my_computers": "My computers",diff --git a/apps/cua-spaces/src/i18n/locales/es/spaces.json b/apps/cua-spaces/src/i18n/locales/es/spaces.jsonindex 036b1f0d88..d75d887b35 100644--- a/apps/cua-spaces/src/i18n/locales/es/spaces.json+++ b/apps/cua-spaces/src/i18n/locales/es/spaces.json@@ -61,7 +61,6 @@"spaces.window_stream.no_windows": "Aún no hay ventanas abiertas en {name}.","spaces.window_stream.close_window": "Cerrar ventana","spaces.create.creating": "Creando un Space…",- "spaces.sidebar.section.cloud": "Cua Cloud","spaces.sidebar.section.this_mac": "Este Mac","spaces.sidebar.section.connected": "Conectados","spaces.sidebar.section.my_computers": "Mis computadoras",diff --git a/apps/cua-spaces/src/i18n/locales/ja/spaces.json b/apps/cua-spaces/src/i18n/locales/ja/spaces.jsonindex 582fb7da81..a350504390 100644--- a/apps/cua-spaces/src/i18n/locales/ja/spaces.json+++ b/apps/cua-spaces/src/i18n/locales/ja/spaces.json@@ -61,7 +61,6 @@"spaces.window_stream.no_windows": "{name}にはまだ開いているウィンドウがありません。","spaces.window_stream.close_window": "ウィンドウを閉じる","spaces.create.creating": "Space を作成中…",- "spaces.sidebar.section.cloud": "Cua Cloud","spaces.sidebar.section.this_mac": "この Mac","spaces.sidebar.section.connected": "接続済み","spaces.sidebar.section.my_computers": "自分のコンピュータ",diff --git a/apps/cua-spaces/src/i18n/locales/ko/spaces.json b/apps/cua-spaces/src/i18n/locales/ko/spaces.jsonindex 0c49588832..b99ab192f2 100644--- a/apps/cua-spaces/src/i18n/locales/ko/spaces.json+++ b/apps/cua-spaces/src/i18n/locales/ko/spaces.json@@ -61,7 +61,6 @@"spaces.window_stream.no_windows": "{name}에 열린 창이 아직 없어요.","spaces.window_stream.close_window": "창 닫기","spaces.create.creating": "Space 만드는 중…",- "spaces.sidebar.section.cloud": "Cua Cloud","spaces.sidebar.section.this_mac": "이 Mac","spaces.sidebar.section.connected": "연결됨","spaces.sidebar.section.my_computers": "내 컴퓨터",diff --git a/apps/cua-spaces/src/i18n/locales/pt-BR/spaces.json b/apps/cua-spaces/src/i18n/locales/pt-BR/spaces.jsonindex 4fb21e4334..ebde6a9880 100644--- a/apps/cua-spaces/src/i18n/locales/pt-BR/spaces.json+++ b/apps/cua-spaces/src/i18n/locales/pt-BR/spaces.json@@ -61,7 +61,6 @@"spaces.window_stream.no_windows": "Ainda não há janelas abertas em {name}.","spaces.window_stream.close_window": "Fechar janela","spaces.create.creating": "Criando um Space…",- "spaces.sidebar.section.cloud": "Cua Cloud","spaces.sidebar.section.this_mac": "Este Mac","spaces.sidebar.section.connected": "Conectados","spaces.sidebar.section.my_computers": "Meus computadores",diff --git a/apps/cua-spaces/src/i18n/locales/zh-Hans/spaces.json b/apps/cua-spaces/src/i18n/locales/zh-Hans/spaces.jsonindex 49f86adf95..4f2e571154 100644--- a/apps/cua-spaces/src/i18n/locales/zh-Hans/spaces.json+++ b/apps/cua-spaces/src/i18n/locales/zh-Hans/spaces.json@@ -61,7 +61,6 @@"spaces.window_stream.no_windows": "{name} 中还没有打开的窗口。","spaces.window_stream.close_window": "关闭窗口","spaces.create.creating": "正在创建 Space…",- "spaces.sidebar.section.cloud": "Cua Cloud","spaces.sidebar.section.this_mac": "这台 Mac","spaces.sidebar.section.connected": "已连接","spaces.sidebar.section.my_computers": "我的电脑",diff --git a/apps/cua-spaces/src/main.tsx b/apps/cua-spaces/src/main.tsxindex 9f4c942d7c..55450b018a 100644--- a/apps/cua-spaces/src/main.tsx+++ b/apps/cua-spaces/src/main.tsx@@ -11,7 +11,7 @@ import "./i18n";import { reportUiLocale } from "./i18n/reportLocale";import { initCore } from "./core";import { createBridge, hasTauri } from "./native/bridge";-import { createFleetBridge } from "./native/fleet";+import { createSpacesBridge } from "./native/spacesBridge";import { declareExperiments } from "./state/experiments";import { SpaceViewer } from "./viewer/SpaceViewer";import { WindowStream } from "./viewer/WindowStream";@@ -31,13 +31,13 @@ async function pickSurface(): Promise<React.ReactElement> {const label = getCurrentWindow().label;if (label.startsWith("space-") || label.startsWith("pip-")) {document.documentElement.classList.add("is-viewer");- return <SpaceViewer fleet={createFleetBridge()} />;+ return <SpaceViewer bridge={createSpacesBridge()} />;}if (label.startsWith("win-") || label.startsWith("winone-")) {// Per-window RCDP client: `win-*` hosts one panel per remote// window; `winone-*` is a single dedicated OS window for one remote window.document.documentElement.classList.add("is-viewer", "is-window-stream");- return <WindowStream fleet={createFleetBridge()} />;+ return <WindowStream bridge={createSpacesBridge()} />;}if (label === "main") {// The main window: an ordinary, opaque desktop window (sidebar, toolbar,diff --git a/apps/cua-spaces/src/model/fleet.test.ts b/apps/cua-spaces/src/model/fleet.test.tsdeleted file mode 100644index d51207cce1..0000000000--- a/apps/cua-spaces/src/model/fleet.test.ts+++ /dev/null@@ -1,96 +0,0 @@-// SPDX-License-Identifier: FSL-1.1-MIT-// Copyright (c) 2026 Cua AI, Inc.--import { describe, expect, it } from "vitest";--import { FIXTURE_NOW, FIXTURE_SPACES } from "./fixtures";-import { clampCount, createFleetLocally, estimateHourly, hourlyRate, resolveMembers } from "./fleet";-import type { FleetDraft } from "./types";--const qa: FleetDraft = {- templateId: "qa-matrix",- region: "us-central",- size: "standard",- autoSuspend: 15,- count: 3,- customOs: "linux",-};--describe("resolveMembers", () => {- it("returns fixed members for non-adjustable templates regardless of count", () => {- expect(resolveMembers({ ...qa, count: 8 }).map((m) => m.name)).toEqual(["Windows QA", "Linux QA", "macOS Verify"]);- });-- it("extends adjustable templates deterministically", () => {- const members = resolveMembers({ ...qa, templateId: "parallel-build", count: 5 });- expect(members.map((m) => m.name)).toEqual(["Builder 1", "Builder 2", "Builder 3", "Builder 4", "Builder 5"]);- expect(members.every((m) => m.os === "linux")).toBe(true);- });-- it("uses the custom OS for the custom template", () => {- const members = resolveMembers({ ...qa, templateId: "custom", count: 2, customOs: "windows" });- expect(members).toEqual([- { name: "Computer 1", os: "windows", scene: "windows-desktop" },- { name: "Computer 2", os: "windows", scene: "windows-desktop" },- ]);- });-- it("clamps counts into range", () => {- expect(clampCount(0)).toBe(1);- expect(clampCount(99)).toBe(8);- expect(clampCount(Number.NaN)).toBe(1);- });-});--describe("estimateHourly", () => {- it("does not price or create an unknown OS as Linux", () => {- expect(() => hourlyRate("unknown", "standard")).toThrow("Cannot price an unknown operating system");- expect(() => createFleetLocally({ ...qa, templateId: "custom", customOs: "unknown" }, [], FIXTURE_NOW)).toThrow("Choose an operating system");- });- it("prices by OS multiplier and sums honestly", () => {- expect(hourlyRate("linux", "standard")).toBe(0.34);- expect(hourlyRate("windows", "standard")).toBe(0.46);- expect(hourlyRate("macos", "standard")).toBe(0.71);- const est = estimateHourly(qa);- expect(est.computers).toBe(3);- expect(est.maxHourlyUsd).toBe(1.51);- expect(est.breakdown).toEqual([- { os: "linux", count: 1, hourlyUsd: 0.34 },- { os: "macos", count: 1, hourlyUsd: 0.71 },- { os: "windows", count: 1, hourlyUsd: 0.46 },- ]);- });-});--describe("createFleetLocally", () => {- it("is deterministic and provisions every member", () => {- const a = createFleetLocally(qa, FIXTURE_SPACES, FIXTURE_NOW);- const b = createFleetLocally(qa, FIXTURE_SPACES, FIXTURE_NOW);- expect(a).toEqual(b);- expect(a.fleet.id).toBe("fleet-1-qa-matrix");- expect(a.spaces.map((s) => s.id)).toEqual(["fleet-1-qa-matrix-1", "fleet-1-qa-matrix-2", "fleet-1-qa-matrix-3"]);- expect(a.spaces.every((s) => s.status === "provisioning" && s.fleetId === a.fleet.id)).toBe(true);- expect(a.fleet.spaceIds).toEqual(a.spaces.map((s) => s.id));- });-- it("de-duplicates names that already exist", () => {- const { spaces } = createFleetLocally(qa, FIXTURE_SPACES, FIXTURE_NOW);- expect(spaces.map((s) => s.name)).toEqual(["Windows QA 2", "Linux QA", "macOS Verify"]);- });-- it("increments the fleet ordinal based on existing fleets", () => {- const first = createFleetLocally(qa, FIXTURE_SPACES, FIXTURE_NOW);- const second = createFleetLocally(- { ...qa, templateId: "clean-browsers" },- [...FIXTURE_SPACES, ...first.spaces],- FIXTURE_NOW + 1,- );- expect(second.fleet.id).toBe("fleet-2-clean-browsers");- });-- it("stamps new Spaces so they lead the MRU order", () => {- const { spaces } = createFleetLocally(qa, FIXTURE_SPACES, FIXTURE_NOW + 5000);- const newest = Math.max(...FIXTURE_SPACES.map((s) => s.lastUsedAt));- expect(spaces.every((s) => s.lastUsedAt > newest)).toBe(true);- });-});diff --git a/apps/cua-spaces/src/model/fleet.ts b/apps/cua-spaces/src/model/fleet.tsdeleted file mode 100644index 0806338948..0000000000--- a/apps/cua-spaces/src/model/fleet.ts+++ /dev/null@@ -1,166 +0,0 @@-// SPDX-License-Identifier: FSL-1.1-MIT-// Copyright (c) 2026 Cua AI, Inc.--import { SIZES } from "./fixtures";-import { getTemplate } from "./templates";-import type {- Fleet,- FleetDraft,- HourlyEstimate,- MachineSize,- Space,- SpaceOs,- TemplateMember,-} from "./types";--/**- * Synthetic OS multipliers on top of the Linux list price. Windows and macOS- * carry licensing overhead; these numbers are illustrative only.- */-const OS_MULTIPLIER: Record<Exclude<SpaceOs, "unknown">, number> = {- linux: 1,- windows: 1.35,- macos: 2.1,-};--export const MIN_FLEET_SIZE = 1;-export const MAX_FLEET_SIZE = 8;--export function clampCount(count: number): number {- if (!Number.isFinite(count)) return MIN_FLEET_SIZE;- return Math.min(MAX_FLEET_SIZE, Math.max(MIN_FLEET_SIZE, Math.round(count)));-}--/** Members the draft would provision, honouring the adjustable count. */-export function resolveMembers(draft: FleetDraft): TemplateMember[] {- const template = getTemplate(draft.templateId);- if (!template.adjustable) return template.members;-- const count = clampCount(draft.count);- const members: TemplateMember[] = template.members.slice(0, count);- const base = template.members[0];- for (let i = members.length; i < count; i += 1) {- members.push(- base- ? { ...base, name: `${stripIndex(base.name)} ${i + 1}` }- : { name: `Computer ${i + 1}`, os: draft.customOs, scene: sceneFor(draft.customOs) },- );- }- return members;-}--function stripIndex(name: string): string {- return name.replace(/\s+[A-Z0-9]$/i, "");-}--function sceneFor(os: SpaceOs): TemplateMember["scene"] {- switch (os) {- case "unknown":- return "blank";- case "windows":- return "windows-desktop";- case "macos":- return "mac-desktop";- case "linux":- return "linux-terminal";- }-}--export function hourlyRate(os: SpaceOs, size: MachineSize): number {- if (os === "unknown") throw new Error("Cannot price an unknown operating system");- const option = SIZES.find((s) => s.id === size);- if (!option) throw new Error(`Unknown size: ${size}`);- return round2(option.linuxHourlyUsd * OS_MULTIPLIER[os]);-}--/**- * Upper-bound hourly estimate: every computer running for a full hour.- * Auto-suspend can only lower the real figure, so the UI labels this "up to".- */-export function estimateHourly(draft: FleetDraft): HourlyEstimate {- const members = resolveMembers(draft);- const byOs = new Map<SpaceOs, number>();- for (const m of members) byOs.set(m.os, (byOs.get(m.os) ?? 0) + 1);-- const breakdown = [...byOs.entries()]- .sort(([a], [b]) => a.localeCompare(b))- .map(([os, count]) => ({ os, count, hourlyUsd: round2(count * hourlyRate(os, draft.size)) }));-- return {- computers: members.length,- maxHourlyUsd: round2(breakdown.reduce((sum, b) => sum + b.hourlyUsd, 0)),- breakdown,- };-}--export interface CreateFleetResult {- fleet: Fleet;- spaces: Space[];-}--/**- * Simulate fleet creation locally. Pure: given the same inputs it yields the- * same ids and names. New Spaces start in `provisioning` and are stamped with- * `now` so they float to the top of the MRU order.- *- * This never contacts a backend. The caller is responsible for merging the- * returned Spaces into UI state.- */-export function createFleetLocally(- draft: FleetDraft,- existing: readonly Space[],- now: number,-): CreateFleetResult {- const template = getTemplate(draft.templateId);- const members = resolveMembers(draft);- if (members.some((m) => m.os === "unknown")) throw new Error("Choose an operating system before creating a Space");- const ordinal = existing.filter((s) => s.fleetId).reduce((set, s) => set.add(s.fleetId!), new Set<string>()).size + 1;- const fleetId = `fleet-${ordinal}-${template.id}`;- const usedNames = new Set(existing.map((s) => s.name));-- const spaces: Space[] = members.map((m, index) => {- const name = uniqueName(m.name, usedNames);- usedNames.add(name);- return {- id: `${fleetId}-${index + 1}`,- name,- os: m.os,- status: "provisioning",- detail: "Starting",- // Slightly staggered so MRU order within the fleet matches member order.- lastUsedAt: now - index,- scene: m.scene,- fleetId,- size: draft.size,- region: draft.region,- };- });-- const fleet: Fleet = {- id: fleetId,- name: template.id === "custom" ? `Custom group ${ordinal}` : template.name,- templateId: template.id,- createdAt: now,- spaceIds: spaces.map((s) => s.id),- region: draft.region,- size: draft.size,- autoSuspend: draft.autoSuspend,- };-- return { fleet, spaces };-}--function uniqueName(base: string, used: ReadonlySet<string>): string {- if (!used.has(base)) return base;- let n = 2;- while (used.has(`${base} ${n}`)) n += 1;- return `${base} ${n}`;-}--function round2(n: number): number {- return Math.round(n * 100) / 100;-}--export function formatUsd(n: number): string {- return `$${n.toFixed(2)}`;-}diff --git a/apps/cua-spaces/src/model/images.ts b/apps/cua-spaces/src/model/images.tsindex 144b53d549..b073189774 100644--- a/apps/cua-spaces/src/model/images.ts+++ b/apps/cua-spaces/src/model/images.ts@@ -18,8 +18,6 @@ export type ImageTier = "slim" | "full" | "xcode" | "docker";/** The image list's local engine: `container` (gVisor when installed, else* runc), `qemu` or `lume`. */export type LocalEngine = "container" | "qemu" | "lume";-/** The image list's cloud engine. */-export type CloudEngine = "gvisor" | "kubevirt";export interface SandboxImage {ref: string;@@ -30,7 +28,6 @@ export interface SandboxImage {summary: string;spacesd: boolean;local: LocalEngine | null;- cloud: CloudEngine | null;/** `slim`, `full` (the default), `xcode` or `docker`: canonical images only. */tier?: ImageTier;published: boolean;@@ -44,7 +41,7 @@ export interface ImageGroup {/** Where the wizard creates: a location, the user's own cloud, or one of* the user's machines that provides Spaces. */-export type Placement = Location | 'yours' | 'host';+export type Placement = Location;/** Every image the pickers show, in file order. */export function pickerImages(): SandboxImage[] {diff --git a/apps/cua-spaces/src/model/mru.ts b/apps/cua-spaces/src/model/mru.tsindex 45754df51a..e316edbed5 100644--- a/apps/cua-spaces/src/model/mru.ts+++ b/apps/cua-spaces/src/model/mru.ts@@ -4,12 +4,7 @@import { core } from "../core";import type { Space } from "./types";-/** A Space on the Cua Spaces pool (listed first). */-export function isSpacesPool(space: Space): boolean {- return core("spaces.isSpacesPool", { space });-}--/** Pool Spaces first, then most recently used, then by name. */+/** Most recently used, then by name. */export function sortByMru(spaces: readonly Space[]): Space[] {return core("spaces.sortByMru", { spaces });}diff --git a/apps/cua-spaces/src/model/parity.test.ts b/apps/cua-spaces/src/model/parity.test.tsindex 343bda1ad7..dbc9dcc6ee 100644--- a/apps/cua-spaces/src/model/parity.test.ts+++ b/apps/cua-spaces/src/model/parity.test.ts@@ -109,14 +109,8 @@ type Args = Record<string, any>; // eslint-disable-line @typescript-eslint/no-ex/** Core methods as the app's model layer answers them. */const MODEL: Record<string, (a: Args) => unknown> = {'spaces.rowsToSpaces': (a) => (a.rows as SpaceRow[]).map((r) => rowToSpace(r, a.now)),- 'roster.initial': (a) => {- const { fleets: _f, ...s } = initialState(a.spaces);- return s;- },- 'roster.reduce': (a) => {- const { fleets: _f, ...s } = reduce({ ...a.state, fleets: [] }, a.action);- return s;- },+ 'roster.initial': (a) => initialState(a.spaces),+ 'roster.reduce': (a) => reduce(a.state, a.action),'creates.reduce': (a) => reduceCreates(a.state, a.action),'creates.compose': (a) => composeCreates(a.spaces, a.state),'creates.isPending': (a) => isPendingCreate(a.id),diff --git a/apps/cua-spaces/src/model/spaces.test.ts b/apps/cua-spaces/src/model/spaces.test.tsindex e4e1efab6c..6dbce1c6e9 100644--- a/apps/cua-spaces/src/model/spaces.test.ts+++ b/apps/cua-spaces/src/model/spaces.test.ts@@ -4,7 +4,6 @@import { describe, expect, it } from "vitest";import {- cloudNamespaceOf,displayName,hasFeature,nameOf,@@ -15,9 +14,9 @@ import {function row(overrides: Partial<SpaceRow> = {}): SpaceRow {return {- id: "space://cloud/cua-spaces-abc/brave-otter",+ id: "space://direct/10.0.0.5:3211",name: "brave-otter",- provider: "cloud",+ provider: "direct",spacesdVersion: "0.4.0",features: ["desktop_stream", "window_stream"],addedAt: "2026-08-30T12:00:00Z",@@ -28,14 +27,13 @@ function row(overrides: Partial<SpaceRow> = {}): SpaceRow {}describe("rowToSpace", () => {- it("maps a reachable cloud row onto a running tile grouped by namespace", () => {+ it("maps a reachable row onto a running tile", () => {const space = rowToSpace(row(), 1_000);- expect(space.id).toBe("space://cloud/cua-spaces-abc/brave-otter");+ expect(space.id).toBe("space://direct/10.0.0.5:3211");expect(space.name).toBe("brave-otter");expect(space.status).toBe("running");- expect(space.provider).toBe("cloud");- expect(space.fleetId).toBe("cua-spaces-abc");- expect(space.detail).toBe("cua-spaces-abc");+ expect(space.provider).toBe("direct");+ expect(space.detail).toBe("10.0.0.5:3211");expect(space.lastUsedAt).toBe(Date.parse("2026-08-30T12:00:00Z"));expect(space.sdk?.features).toContain("desktop_stream");});@@ -55,7 +53,6 @@ describe("rowToSpace", () => {expect(direct.detail).toBe("10.0.0.5:3211");expect(direct.name).toBe("10.0.0.5:3211");expect(direct.lastUsedAt).toBe(42);- expect(direct.fleetId).toBe("direct");const mac = rowToSpace(row({ id: "space://local/space-1", provider: "local", os: "macos" }), 0);expect(mac.scene).toBe("mac-desktop");expect(mac.detail).toBe("This Mac");@@ -63,24 +60,16 @@ describe("rowToSpace", () => {});describe("ids and features", () => {- it("reads locations and namespaces from space ids", () => {+ it("reads locations from space ids", () => {expect(providerOfId("space://direct/h:1")).toBe("direct");expect(providerOfId("space://local/x")).toBe("local");expect(providerOfId("pending:1")).toBeUndefined();- expect(cloudNamespaceOf("space://cloud/ns/box")).toBe("ns");- expect(cloudNamespaceOf("space://local/x")).toBeUndefined();});it("reads the unified refs the SDK prints", () => {- expect(providerOfId("cloud:box")).toBe("cloud");expect(providerOfId("local:box")).toBe("local");expect(providerOfId("direct:10.0.0.5:3211")).toBe("direct");expect(providerOfId("relay:0123abcd4567")).toBe("relay");- expect(cloudNamespaceOf("cloud:box")).toBeUndefined();- const cloud = rowToSpace(row({ id: "cloud:box", provider: "cloud" }), 0);- expect(cloud.provider).toBe("cloud");- expect(cloud.fleetId).toBe("cloud");- expect(cloud.detail).toBe("Cua Cloud");const direct = rowToSpace(row({ id: "direct:10.0.0.5:3211", name: "10.0.0.5:3211", provider: "direct" }),0,diff --git a/apps/cua-spaces/src/model/spaces.ts b/apps/cua-spaces/src/model/spaces.tsindex a05dd65f23..83c91ba682 100644--- a/apps/cua-spaces/src/model/spaces.ts+++ b/apps/cua-spaces/src/model/spaces.ts@@ -4,7 +4,7 @@/*** The cua SDK's Spaces registry, mapped onto the portal's Space model.*- * Every location (Cua Cloud, this Mac, Spaces added by address) arrives+ * Every location (this Mac, your machines, Spaces added by address) arrives* through one `list_spaces` roster. The SDK owns lifecycle, the* runtime/image pairing rules and the spacesd handshake; this module only* turns its rows into tiles.@@ -26,7 +26,7 @@ export const SPACES_CONFIG = {export interface SpaceRow {id: string;name: string;- /** The SDK's location word: `cloud`, `local`, `direct` or `relay`. */+ /** The SDK's location word: `local`, `direct` or `relay`. */provider: SpaceProvider;spacesdVersion: string;features: string[];@@ -71,7 +71,7 @@ export function hasFeature(space: Pick<Space, "sdk">, feature: string): booleanreturn Boolean(space.sdk?.features.includes(feature));}-/** The provider a Space id names (`cloud:<name>`, `space://<loc>/…`). */+/** The provider a Space id names (`space://<loc>/…`). */export function providerOfId(id: string): SpaceProvider | undefined {return core<SpaceProvider | null>("spaces.providerOfId", { id }) ?? undefined;}@@ -81,11 +81,6 @@ export function normalizeProvider(word: string): SpaceProvider {return core("spaces.normalizeProvider", { word });}-/** The cloud namespace of a legacy `space://cloud/<ns>/<name>` id. */-export function cloudNamespaceOf(id: string): string | undefined {- return core<string | null>("spaces.cloudNamespaceOf", { id }) ?? undefined;-}-export function sceneForOs(os: SpaceOs): ThumbnailScene {return core("spaces.sceneForOs", { os });}diff --git a/apps/cua-spaces/src/model/templates.ts b/apps/cua-spaces/src/model/templates.tsdeleted file mode 100644index c143186691..0000000000--- a/apps/cua-spaces/src/model/templates.ts+++ /dev/null@@ -1,60 +0,0 @@-// SPDX-License-Identifier: FSL-1.1-MIT-// Copyright (c) 2026 Cua AI, Inc.--import type { FleetTemplate, TemplateId } from "./types";--export const TEMPLATES: FleetTemplate[] = [- {- id: "qa-matrix",- name: "QA Matrix",- summary: "Windows + Linux + macOS · 3 computers",- description:- "One computer per desktop OS so an agent can run the same test plan everywhere and diff the results.",- members: [- { name: "Windows QA", os: "windows", scene: "windows-desktop" },- { name: "Linux QA", os: "linux", scene: "linux-terminal" },- { name: "macOS Verify", os: "macos", scene: "mac-desktop" },- ],- adjustable: false,- },- {- id: "parallel-build",- name: "Parallel Build",- summary: "3 Linux builders",- description:- "Identical Linux builders that split a build or test suite into shards. Add more to shorten the critical path.",- members: [- { name: "Builder 1", os: "linux", scene: "linux-terminal" },- { name: "Builder 2", os: "linux", scene: "linux-terminal" },- { name: "Builder 3", os: "linux", scene: "linux-terminal" },- ],- adjustable: true,- },- {- id: "clean-browsers",- name: "Clean Browsers",- summary: "3 isolated browser computers",- description:- "Fresh browser profiles on isolated computers for sign-up flows, A/B checks, and anything that must not share cookies.",- members: [- { name: "Browser A", os: "linux", scene: "browser" },- { name: "Browser B", os: "linux", scene: "browser" },- { name: "Browser C", os: "linux", scene: "browser" },- ],- adjustable: true,- },- {- id: "custom",- name: "Custom",- summary: "Choose systems and sizes",- description: "Start from a blank group and pick the operating system and computer count yourself.",- members: [],- adjustable: true,- },-];--export function getTemplate(id: TemplateId): FleetTemplate {- const found = TEMPLATES.find((t) => t.id === id);- if (!found) throw new Error(`Unknown template: ${id}`);- return found;-}diff --git a/apps/cua-spaces/src/model/types.ts b/apps/cua-spaces/src/model/types.tsindex dc42756bd3..3bf5b4e26d 100644--- a/apps/cua-spaces/src/model/types.ts+++ b/apps/cua-spaces/src/model/types.ts@@ -53,24 +53,27 @@ export interface SpaceSdkRef {}/**- * Where a Space runs: the SDK's location words. `cloud` is Cua Cloud,- * `local` this Mac, `direct` a machine added by address, `relay` a machine- * of the signed-in account reached through the cua relay.+ * Where a Space runs: the SDK's location words. `local` is this Mac,+ * `direct` a machine added by address (or reached directly), `relay` a+ * machine of the signed-in account reached through the cua relay.*/-export type SpaceProvider = "cloud" | "local" | "direct" | "relay";+export type SpaceProvider = "local" | "direct" | "relay";-/** Where new Spaces can be created (existing machines are added, not created). */-export type Location = "cloud" | "local";+/**+ * Where new Spaces can be created: this Mac, one of your own computers+ * (your cloud account or a machine of yours), or a machine that provides+ * Spaces (host).+ */+export type Location = "local" | "yours" | "host";/** What kind of machine a Space is. */export type SpaceKind = "container" | "vm";/*** Which engine runs it. Local: `gvisor`, `runc` (containers), `qemu`, `lume`- * (VMs). Cloud: `gvisor` (containers), `kubevirt` (VMs). `auto` lets the SDK- * pick for the location and image.+ * (VMs). `auto` lets the SDK pick for the location and image.*/-export type Runtime = "auto" | "gvisor" | "runc" | "qemu" | "lume" | "kubevirt";+export type Runtime = "auto" | "gvisor" | "runc" | "qemu" | "lume";export interface Space {id: string;@@ -85,12 +88,10 @@ export interface Space {* progress so it doesn't reset when the UI reopens. */startedAt?: number;scene: ThumbnailScene;- /** The group this Space belongs to (a cloud namespace or its location). */- fleetId?: string;/** Machine size label; undefined for the local Mac. */size?: MachineSize;region?: RegionId;- /** Where this Space runs; treated as "cloud" when omitted. */+ /** Where this Space runs; treated as "relay" when omitted. */provider?: SpaceProvider;/** SDK registry facts, when the Space came from the live registry. */sdk?: SpaceSdkRef;@@ -175,51 +176,3 @@ export interface SizeOption {/** Synthetic hourly list price in USD for a Linux computer at this size. */linuxHourlyUsd: number;}--export type TemplateId = "qa-matrix" | "parallel-build" | "clean-browsers" | "custom";--export interface TemplateMember {- name: string;- os: SpaceOs;- scene: ThumbnailScene;-}--export interface FleetTemplate {- id: TemplateId;- name: string;- summary: string;- description: string;- members: TemplateMember[];- /** Whether the user may edit the computer count. */- adjustable: boolean;-}--export interface FleetDraft {- templateId: TemplateId;- region: RegionId;- size: MachineSize;- autoSuspend: AutoSuspendMinutes;- /** Requested number of computers; only honoured for adjustable templates. */- count: number;- /** OS used for computers beyond the template's explicit members. */- customOs: SpaceOs;-}--export interface Fleet {- id: string;- name: string;- templateId: TemplateId;- createdAt: number;- spaceIds: string[];- region: RegionId;- size: MachineSize;- autoSuspend: AutoSuspendMinutes;-}--export interface HourlyEstimate {- computers: number;- /** Upper bound per hour when every computer is running. */- maxHourlyUsd: number;- /** Per-OS breakdown for transparency. */- breakdown: { os: SpaceOs; count: number; hourlyUsd: number }[];-}diff --git a/apps/cua-spaces/src/model/window.ts b/apps/cua-spaces/src/model/window.tsindex 31b2f04f20..4f4cfdfdc8 100644--- a/apps/cua-spaces/src/model/window.ts+++ b/apps/cua-spaces/src/model/window.ts@@ -11,7 +11,7 @@ import { core } from "../core";import type { Msg } from "../i18n";import type { DriveSyncInput } from "./persistent";import type { RemoteWindow } from "./teleport";-import type { Location, Space, SpaceOs, SpaceStatus } from "./types";+import type { Space, SpaceOs, SpaceStatus } from "./types";export interface SidebarRow {id: string;@@ -118,9 +118,6 @@ export interface SpaceDetailView {cancelLabel: string;};sections: string[];- /** A cloud Space refused for want of credit: one line and "Add credit"- * (the website billing page). */- creditNotice?: { text: string; button: string; url: string } | null;/** Why turning it off or on failed, shown inline. */powerError?: string | null;}@@ -302,14 +299,10 @@ export interface SettingsInput {signIn: SignInPhase;canSignOut: boolean;menuBar: boolean;- defaultLocation: Location;- locationLockedBy?: string | null;telemetry?: { enabled: boolean; lockedBy?: string | null } | null;agents?: AgentSettingsRow[] | null;agentsBusy: boolean;agentsPending: string[];- /** The account's Cua Cloud billing (Settings, Billing), once read. */- billing?: import("../native/fleet").BillingStatus | null;/** Launch at login, once the system was asked (none: no rows). */loginItem?: import("./loginItem").LoginItemInput | null;/** Settings, Experiments (what the page mentions follows them). */diff --git a/apps/cua-spaces/src/native/appDrop.test.ts b/apps/cua-spaces/src/native/appDrop.test.tsindex ccd833892b..9e325a0fd7 100644--- a/apps/cua-spaces/src/native/appDrop.test.ts+++ b/apps/cua-spaces/src/native/appDrop.test.ts@@ -8,7 +8,7 @@ import { createFallbackTeleportAppsBridge, FIXTURE_CATALOG } from "./teleportApp// Fixture catalog and fixture paths only: nothing reads this machine's apps.const apps = createFallbackTeleportAppsBridge();-const space = { id: "cloud:aurora", name: "Aurora" };+const space = { id: "direct:aurora", name: "Aurora" };describe("app drops on a Space", () => {it("opens the picker preselected with a dropped app and its files", async () => {@@ -21,7 +21,7 @@ describe("app drops on a Space", () => {);expect(handled).toBe(true);expect(open).toHaveBeenCalledWith(- "cloud:aurora",+ "direct:aurora","Aurora",{ id: "vscode", name: "Visual Studio Code" },JSON.parse(FIXTURE_CATALOG[1]!.json),@@ -39,6 +39,6 @@ describe("app drops on a Space", () => {it("still opens the full catalog for an app it cannot read", async () => {const open = vi.fn();expect(await handleAppDrop(["/Applications/Unknown Thing.app"], space, open, apps)).toBe(true);- expect(open).toHaveBeenCalledWith("cloud:aurora", "Aurora", null, null, []);+ expect(open).toHaveBeenCalledWith("direct:aurora", "Aurora", null, null, []);});});diff --git a/apps/cua-spaces/src/native/bridge.ts b/apps/cua-spaces/src/native/bridge.tsindex fa44dc904b..dd68ea0732 100644--- a/apps/cua-spaces/src/native/bridge.ts+++ b/apps/cua-spaces/src/native/bridge.ts@@ -31,13 +31,13 @@ export const FALLBACK_SIZES: Record<DisplayStyle, Record<WindowMode, { width: nuambient: { width: 420, height: 38 },"ambient-teleport": { width: 420, height: 96 },switcher: { width: 760, height: 320 },- "create-fleet": { width: 600, height: 700 },+ "create-space": { width: 600, height: 700 },},"no-notch": {ambient: { width: 180, height: 34 },"ambient-teleport": { width: 240, height: 96 },switcher: { width: 760, height: 300 },- "create-fleet": { width: 600, height: 680 },+ "create-space": { width: 600, height: 680 },},};diff --git a/apps/cua-spaces/src/native/local.ts b/apps/cua-spaces/src/native/local.tsindex 0750bc3b20..7f93ff5fb0 100644--- a/apps/cua-spaces/src/native/local.ts+++ b/apps/cua-spaces/src/native/local.ts@@ -4,7 +4,7 @@/*** What this Mac can run: Spaces the cua SDK runs locally (containers under* gVisor or runc, QEMU or Lume VMs). Backs the New Space wizard's "This Mac"- * choice. Creating goes through `FleetBridge.createSpace({ on: "local" })`.+ * choice. Creating goes through `SpacesBridge.createSpace({ on: "local" })`.* Off Tauri (browser dev / tests) `available` is simply false.*/diff --git a/apps/cua-spaces/src/native/fleet.ts b/apps/cua-spaces/src/native/spacesBridge.tssimilarity index 90%rename from apps/cua-spaces/src/native/fleet.tsrename to apps/cua-spaces/src/native/spacesBridge.tsindex de7e92debf..c62d70ce23 100644--- a/apps/cua-spaces/src/native/fleet.ts+++ b/apps/cua-spaces/src/native/spacesBridge.ts@@ -89,7 +89,7 @@ export interface ViewerConfig {*/export interface SpaceCreateConfig {image?: string;- /** `local`, `cloud`, or a connected cloud's word (`aws`, `gcp`, `hetzner`, `modal`). */+ /** `local`, or a connected cloud's word (`aws`, `gcp`, `hetzner`, `modal`). */on?: Location | string;kind?: SpaceKind | "auto";runtime?: Runtime;@@ -110,7 +110,7 @@ export interface SpaceCreateConfig {/** Where new Spaces go by default (`default.on`), and where that came from. */export interface DefaultLocation {- /** `local`, `cloud`, or a connected cloud's word (`aws`). */+ /** `local`, or a connected cloud's word (`aws`). */value: Location | string;/** `env` (CUA_DEFAULT_ON, read-only here), `config` or `default`. */source: "env" | "config" | "default";@@ -213,31 +213,9 @@ export interface GpuChoice {learnMore?: string | null;}-/** This account's Cua Cloud rates (the app core's `CloudPricing`). */-export interface CloudPricing {- /** USD per reserved vCPU per hour. */- vcpuHourUsd: number;- /** USD per reserved GB of memory per hour. */- memoryGibHourUsd: number;-}--/** The account's Cua Cloud billing (the app core's `billing::BillingStatus`):- * the credit left and the website billing page. The app takes no payment- * details; the website does. */-export interface BillingStatus {- billingEnabled: boolean;- card: { brand: string; last4: string } | null;- credit: { balanceUsdCents: number } | null;- billingUrl: string | null;-}--export interface FleetBridge {+export interface SpacesBridge {readonly isNative: boolean;status(): Promise<AccountStatus>;- /** Always null in the native app: Cua Cloud has ended, so there are no rates. */- cloudPricing?(): Promise<CloudPricing | null>;- /** Always null in the native app: Cua Cloud has ended, so there is no billing. */- billingStatus?(): Promise<BillingStatus | null>;daemonStatus(): Promise<DaemonStatus>;ensureDaemon(): Promise<DaemonStatus>;localStatus(): Promise<LocalStatus>;@@ -275,8 +253,6 @@ export interface FleetBridge {removeSpace(spaceId: string): Promise<void>;/** Where new Spaces go by default. */defaultLocation(): Promise<DefaultLocation>;- /** Stores the default location in `$CUA_HOME/config.toml`. */- setDefaultLocation(on: Location): Promise<DefaultLocation>;/** Fires after add/create/delete/remove anywhere in the app. */onSpacesChanged(handler: () => void): Promise<() => void>;/** Returns a `data:image/…;base64,…` URL. */@@ -330,7 +306,7 @@ export interface FleetBridge {const NOT_NATIVE = "Spaces commands need the Tauri shell";-export function createFallbackFleetBridge(): FleetBridge {+export function createFallbackSpacesBridge(): SpacesBridge {const unavailable = () => Promise.reject(new Error(NOT_NATIVE));const noopUnsub = async () => () => {};return {@@ -351,7 +327,6 @@ export function createFallbackFleetBridge(): FleetBridge {deleteSpace: unavailable,removeSpace: unavailable,defaultLocation: async () => BUILTIN_DEFAULT_LOCATION,- setDefaultLocation: unavailable,onSpacesChanged: noopUnsub,screenshot: unavailable,openStream: unavailable,@@ -379,7 +354,7 @@ export function createFallbackFleetBridge(): FleetBridge {};}-export function createTauriFleetBridge(): FleetBridge {+export function createTauriSpacesBridge(): SpacesBridge {// Imported lazily so the browser/test bundle never touches Tauri globals.const core = import("@tauri-apps/api/core");const event = import("@tauri-apps/api/event");@@ -391,12 +366,10 @@ export function createTauriFleetBridge(): FleetBridge {};return {isNative: true,- status: () => invoke<AccountStatus>("fleet_status"),+ status: () => invoke<AccountStatus>("account_status"),daemonStatus: () => invoke<DaemonStatus>("daemon_status"),ensureDaemon: () => invoke<DaemonStatus>("ensure_daemon"),localStatus: () => invoke<LocalStatus>("local_status"),- cloudPricing: () => invoke<CloudPricing | null>("cloud_pricing"),- billingStatus: () => invoke<BillingStatus | null>("billing_status"), // resolves null (no Fleets call)listSpaces: () => invoke<SpaceRow[]>("list_spaces"),spaceInfo: (spaceId) => invoke<SpaceRow>("space_info", { spaceId }),addSpace: (url, token, name) =>@@ -412,7 +385,6 @@ export function createTauriFleetBridge(): FleetBridge {setSpacePower: (spaceId, on) => invoke<SpacePowerReport>("set_space_power", { spaceId, on }),removeSpace: (spaceId) => invoke<void>("remove_space", { spaceId }),defaultLocation: () => invoke<DefaultLocation>("get_default_location"),- setDefaultLocation: (on) => invoke<DefaultLocation>("set_default_location", { on }),onSpacesChanged: (handler) => on<unknown>("spaces:changed", () => handler()),screenshot: (spaceId, maxDimension) =>invoke<string>("space_screenshot", { spaceId, maxDimension: maxDimension ?? null }),@@ -462,6 +434,6 @@ export function createTauriFleetBridge(): FleetBridge {};}-export function createFleetBridge(): FleetBridge {- return hasTauri() ? createTauriFleetBridge() : createFallbackFleetBridge();+export function createSpacesBridge(): SpacesBridge {+ return hasTauri() ? createTauriSpacesBridge() : createFallbackSpacesBridge();}diff --git a/apps/cua-spaces/src/native/types.ts b/apps/cua-spaces/src/native/types.tsindex a451a0a95d..a87771c03c 100644--- a/apps/cua-spaces/src/native/types.ts+++ b/apps/cua-spaces/src/native/types.ts@@ -6,7 +6,7 @@* `src-tauri/src/geometry.rs` (serde uses kebab-case for enums).*/-export type WindowMode = "ambient" | "ambient-teleport" | "switcher" | "create-fleet";+export type WindowMode = "ambient" | "ambient-teleport" | "switcher" | "create-space";/** How the portal should draw itself. */export type DisplayStyle = "notched" | "no-notch";diff --git a/apps/cua-spaces/src/state/cloud.tsx b/apps/cua-spaces/src/state/cloud.tsxindex aa1e1bb329..2be2c6aa7b 100644--- a/apps/cua-spaces/src/state/cloud.tsx+++ b/apps/cua-spaces/src/state/cloud.tsx@@ -37,27 +37,27 @@ import type { HostStatus } from "../native/host";import type { Location, Space, SpaceKind, SpaceOs } from "../model/types";import {BUILTIN_DEFAULT_LOCATION,- createFallbackFleetBridge,+ createFallbackSpacesBridge,type DefaultLocation,- type FleetBridge,+ type SpacesBridge,type SpaceCreateConfig,type ViewerWindowRequest,-} from "../native/fleet";+} from "../native/spacesBridge";import type { PortalAction } from "./portal";-export interface FleetContextValue {+export interface SpacesContextValue {/** True when the native shell's Spaces registry drives the switcher. */live: boolean;- bridge: FleetBridge;+ bridge: SpacesBridge;}-export const FleetContext = createContext<FleetContextValue>({+export const SpacesContext = createContext<SpacesContextValue>({live: false,- bridge: createFallbackFleetBridge(),+ bridge: createFallbackSpacesBridge(),});-export function useFleet(): FleetContextValue {- return useContext(FleetContext);+export function useSpaces(): SpacesContextValue {+ return useContext(SpacesContext);}/** Window request for a registered Space; null for fixtures and placeholders. */@@ -72,7 +72,7 @@ export function viewerRequestFor(space: Space): ViewerWindowRequest | null {};}-export interface FleetSync {+export interface SpacesSync {live: boolean;/** Refresh failure; previously loaded rows remain available. */rosterError: string | null;@@ -82,8 +82,6 @@ export interface FleetSync {refresh: () => Promise<void>;/** Where new Spaces go when a create names no location. */defaultLocation: DefaultLocation;- /** Store a new default location (Settings). */- setDefaultLocation: (on: Location) => Promise<DefaultLocation>;/** Reads the default location again (after "Make default" connected a cloud). */refreshDefaultLocation: () => Promise<void>;/** Create a Space (in the default location unless `config.on` says):@@ -120,12 +118,12 @@ function uid(): string {return globalThis.crypto?.randomUUID?.() ?? Math.random().toString(36).slice(2);}-export function useFleetSync(- fleet: FleetBridge,+export function useSpacesSync(+ bridge: SpacesBridge,dispatch: (action: PortalAction) => void,now: () => number,-): FleetSync {- const live = fleet.isNative;+): SpacesSync {+ const live = bridge.isNative;const [rosterError, setRosterError] = useState<string | null>(null);const rosterLoaded = useRef(false);const [identity, setIdentity] = useState<string | undefined>(undefined);@@ -178,7 +176,7 @@ export function useFleetSync(const refresh = useCallback(async () => {try {- rowsRef.current = await fleet.listSpaces();+ rowsRef.current = await bridge.listSpaces();rosterLoaded.current = true;setRosterError(null);// Finished creates the registry lists, finished deletes it dropped@@ -197,7 +195,7 @@ export function useFleetSync(} finally {publish();}- }, [fleet, publish]);+ }, [bridge, publish]);/** Show the new Space's row while `create` runs (following its* progress), then hand over to the registry's row. */@@ -252,7 +250,7 @@ export function useFleetSync(let unsub: (() => void) | undefined;let cancelled = false;void Promise.resolve(- fleet.onCreateProgress?.((p) =>+ bridge.onCreateProgress?.((p) =>sendCreate({type: "progress",id: p.pendingId,@@ -274,7 +272,7 @@ export function useFleetSync(cancelled = true;unsub?.();};- }, [fleet, sendCreate, now]);+ }, [bridge, sendCreate, now]);// While a create runs, time moves its bar within a phase that reports no// fraction (the app core computes it from `now`, as the SwiftUI app does).@@ -286,7 +284,7 @@ export function useFleetSync(useEffect(() => {let cancelled = false;- void Promise.resolve(fleet.hostArch?.())+ void Promise.resolve(bridge.hostArch?.()).then((arch) => {if (!arch || cancelled) return;hostArchRef.current = arch;@@ -296,16 +294,16 @@ export function useFleetSync(return () => {cancelled = true;};- }, [fleet]);+ }, [bridge]);const applyStatus = useCallback(() => {- return fleet+ return bridge.status().then((status) => {setIdentity(status.identity);}).catch(() => {});- }, [fleet]);+ }, [bridge]);useEffect(() => {void applyStatus();@@ -313,7 +311,7 @@ export function useFleetSync(useEffect(() => {let cancelled = false;- void Promise.resolve(fleet.defaultLocation?.())+ void Promise.resolve(bridge.defaultLocation?.()).then((d) => {if (d && !cancelled) setDefaultLocationState(d);})@@ -321,21 +319,12 @@ export function useFleetSync(return () => {cancelled = true;};- }, [fleet]);+ }, [bridge]);const refreshDefaultLocation = useCallback(async () => {- const d = await Promise.resolve(fleet.defaultLocation?.()).catch(() => undefined);+ const d = await Promise.resolve(bridge.defaultLocation?.()).catch(() => undefined);if (d) setDefaultLocationState(d);- }, [fleet]);-- const setDefaultLocation = useCallback(- async (on: Location) => {- const next = await fleet.setDefaultLocation(on);- setDefaultLocationState(next);- return next;- },- [fleet],- );+ }, [bridge]);// Re-sync when the user signs in or out (device grant).useEffect(() => {@@ -351,25 +340,25 @@ export function useFleetSync(.catch(() => {});};track(- fleet.onSignedIn?.((id) => {+ bridge.onSignedIn?.((id) => {if (id) setIdentity(id);void applyStatus();void refresh().catch(() => {});}),);track(- fleet.onSignedOut?.(() => {+ bridge.onSignedOut?.(() => {setIdentity(undefined);void applyStatus();}),);// Any window (or the MCP-driven control path) changing the registry.- track(fleet.onSpacesChanged?.(() => void refresh().catch(() => {})));+ track(bridge.onSpacesChanged?.(() => void refresh().catch(() => {})));return () => {cancelled = true;for (const unsub of unsubs) unsub();};- }, [fleet, applyStatus, refresh]);+ }, [bridge, applyStatus, refresh]);// Poll the registry while live.useEffect(() => {@@ -395,24 +384,24 @@ export function useFleetSync(config?.name ?? "",macos ? "macos" : windows ? "windows" : "linux",// A Space in the user's own cloud lists as a relay machine.- on === "local" || on === "cloud" ? on : "relay",- () => fleet.createSpace(config, id),+ on === "local" ? "local" : "relay",+ () => bridge.createSpace(config, id),config?.image,kind,Boolean(config?.gpu),);},- [fleet, withPendingRow, defaultLocation.value],+ [bridge, withPendingRow, defaultLocation.value],);const dismissCreate = useCallback((pendingId: string) => sendCreate({ type: "dismiss", id: pendingId }), [sendCreate]);const cancelCreate = useCallback(async (pendingId: string) => {- if (!fleet.cancelCreate) return;+ if (!bridge.cancelCreate) return;sendCreate({ type: "cancel-start", id: pendingId });try {- await fleet.cancelCreate(pendingId);+ await bridge.cancelCreate(pendingId);} catch (error) {sendCreate({type: "cancel-fail",@@ -423,16 +412,16 @@ export function useFleetSync(}sendCreate({ type: "cancel-done", id: pendingId });},- [fleet, sendCreate],+ [bridge, sendCreate],);const addSpace = useCallback(async (url: string, token?: string, name?: string) => {- const row = await fleet.addSpace(url, token, name);+ const row = await bridge.addSpace(url, token, name);await refresh().catch(() => {});return row.id;},- [fleet, refresh],+ [bridge, refresh],);const deleteSpace = useCallback(@@ -448,8 +437,8 @@ export function useFleetSync(if (isDeleting(createsRef.current, space.id)) return;sendCreate({ type: "delete-start", id: space.id, now: now() });try {- if (removeOnly) await fleet.removeSpace(space.id);- else await fleet.deleteSpace(space.id);+ if (removeOnly) await bridge.removeSpace(space.id);+ else await bridge.deleteSpace(space.id);} catch (error) {sendCreate({ type: "delete-fail", id: space.id });throw error;@@ -458,15 +447,15 @@ export function useFleetSync(sendCreate({ type: "delete-done", id: space.id });await refresh().catch(() => {});},- [fleet, refresh, sendCreate, now],+ [bridge, refresh, sendCreate, now],);const setPower = useCallback(async (space: Space, on: boolean) => {- if (!fleet.setSpacePower || isPowering(createsRef.current, space.id)) return;+ if (!bridge.setSpacePower || isPowering(createsRef.current, space.id)) return;sendCreate({ type: "power-start", id: space.id, on, now: now() });try {- await fleet.setSpacePower(space.id, on);+ await bridge.setSpacePower(space.id, on);} catch (error) {sendCreate({type: "power-fail",@@ -479,7 +468,7 @@ export function useFleetSync(sendCreate({ type: "power-done", id: space.id });await refresh().catch(() => {});},- [fleet, refresh, sendCreate, now],+ [bridge, refresh, sendCreate, now],);return {@@ -489,7 +478,6 @@ export function useFleetSync(refresh,defaultLocation,refreshDefaultLocation,- setDefaultLocation,createSpace,dismissCreate,cancelCreate,diff --git a/apps/cua-spaces/src/state/createSpace.ts b/apps/cua-spaces/src/state/createSpace.tsindex c14ac87fd5..f3f93eca11 100644--- a/apps/cua-spaces/src/state/createSpace.ts+++ b/apps/cua-spaces/src/state/createSpace.ts@@ -3,7 +3,7 @@import { core } from "../core";import type { CreatePlan } from "../components/desktop/NewSpaceWizard";-import type { FleetSync } from "./cloud";+import type { SpacesSync } from "./cloud";/*** Turns a New Space plan into the SDK call that creates it: one@@ -12,7 +12,7 @@ import type { FleetSync } from "./cloud";* the Space id; until then the Space shows as `pendingId`'s row.*/export function createFromPlan(- sync: Pick<FleetSync, "createSpace">,+ sync: Pick<SpacesSync, "createSpace">,plan: CreatePlan,pendingId?: string,): Promise<string> {diff --git a/apps/cua-spaces/src/state/portal.ts b/apps/cua-spaces/src/state/portal.tsindex 939d5b50f5..3088e5e31d 100644--- a/apps/cua-spaces/src/state/portal.ts+++ b/apps/cua-spaces/src/state/portal.ts@@ -1,11 +1,9 @@// SPDX-License-Identifier: FSL-1.1-MIT// Copyright (c) 2026 Cua AI, Inc.-import { createFleetLocally } from "../model/fleet";import { FIXTURE_SPACES } from "../model/fixtures";import { core } from "../core";-import { sortByMru } from "../model/mru";-import type { Fleet, FleetDraft, Space } from "../model/types";+import type { Space } from "../model/types";import type { WindowMode } from "../native/types";/**@@ -20,7 +18,6 @@ export interface Notice {export interface PortalState {mode: WindowMode;spaces: Space[];- fleets: Fleet[];/** Currently selected Space (the one the user is "in"). */selectedId: string;/** Keyboard focus inside the switcher, as an index into the MRU list; `-1` when on the "+ New" tile. */@@ -30,15 +27,6 @@ export interface PortalState {noticeSeq: number;}-export const DEFAULT_DRAFT: FleetDraft = {- templateId: "qa-matrix",- region: "us-central",- size: "standard",- autoSuspend: 15,- count: 3,- customOs: "linux",-};-export type PortalAction =| { type: "expand" }| { type: "collapse" }@@ -47,7 +35,6 @@ export type PortalAction =| { type: "focus"; index: number }| { type: "focus-move"; delta: 1 | -1 }| { type: "select"; id: string; now: number }- | { type: "create-fleet"; draft: FleetDraft; now: number }| { type: "clear-notice"; id: number }/** Transient status line (e.g. "Creating a Space…" during a drag-to-New). */| { type: "notify"; text: string; kind?: "switch" | "create" }@@ -55,7 +42,7 @@ export type PortalAction =| { type: "sync-spaces"; spaces: Space[] };export function initialState(spaces: readonly Space[] = FIXTURE_SPACES): PortalState {- return { ...core<Omit<PortalState, "fleets">>("roster.initial", { spaces }), fleets: [] };+ return core<PortalState>("roster.initial", { spaces });}/** Index of the "+ New" tile in keyboard order (right after the last Space). */@@ -70,29 +57,8 @@ export const NEW_SPACE_DROP_ID = "__new_space__";/*** Advances the portal. Every action is the app core's Space list state- * machine (`cua-spaces-app-core::spaces::roster`), except `create-fleet`:- * the browser preview's synthetic fleets (`model/fleet.ts`), not app logic.+ * machine (`cua-spaces-app-core::spaces::roster`).*/export function reduce(state: PortalState, action: PortalAction): PortalState {- if (action.type === "create-fleet") {- const { fleet, spaces } = createFleetLocally(action.draft, state.spaces, action.now);- const merged = sortByMru([...state.spaces, ...spaces]);- const seq = state.noticeSeq + 1;- return {- ...state,- mode: "switcher",- spaces: merged,- fleets: [...state.fleets, fleet],- focusIndex: 0,- noticeSeq: seq,- notice: {- id: seq,- kind: "create",- text: `${fleet.name} · starting ${spaces.length} ${spaces.length === 1 ? "Space" : "Spaces"}`,- },- };- }- const { fleets, ...roster } = state;- const next = core<Omit<PortalState, "fleets">>("roster.reduce", { state: roster, action });- return { ...next, fleets };+ return core<PortalState>("roster.reduce", { state, action });}diff --git a/apps/cua-spaces/src/styles/app.css b/apps/cua-spaces/src/styles/app.cssindex c6b44eecf9..ed74f42fa1 100644--- a/apps/cua-spaces/src/styles/app.css+++ b/apps/cua-spaces/src/styles/app.css@@ -2167,247 +2167,9 @@ kbd {}/* ------------------------------------------------------------------ */-/* Create fleet */+/* Form controls *//* ------------------------------------------------------------------ */-.create {- padding: 10px 22px 18px;- gap: 14px;-}-.create-header {- display: flex;- flex-direction: column;- align-items: flex-start;- gap: 2px;- padding-top: 4px;-}-.grabber {- align-self: center;- width: 44px;- height: 4px;- border-radius: 2px;- background: var(--ink-3);- opacity: 0.6;- margin-bottom: 10px;-}-.create-title {- margin: 0;- font-size: 22px;- font-weight: 700;- letter-spacing: -0.02em;-}-.create-subtitle {- margin: 0;- color: var(--ink-2);- font-size: 13px;-}--.template-list {- display: flex;- flex-direction: column;- gap: 8px;-}-.template {- border-radius: var(--radius-lg);- background: var(--fill);- border: 1.5px solid transparent;- transition:- border-color var(--dur-fast) var(--ease-out),- background var(--dur-fast) var(--ease-out);-}-.template[data-active="true"] {- border-color: var(--accent);- background: var(--acrylic-bg-strong);-}-.template-row {- display: grid;- grid-template-columns: 32px 1fr 22px;- align-items: center;- gap: 14px;- width: 100%;- padding: 12px 14px;- border: 0;- background: transparent;- text-align: left;- border-radius: var(--radius-lg);-}-.template-row:hover {- background: var(--fill);-}-.template-text {- display: flex;- flex-direction: column;- gap: 1px;- min-width: 0;-}-.template-name {- font-size: 14px;- font-weight: 600;-}-.template-summary {- font-size: 12px;- color: var(--ink-2);-}-.radio-mark {- width: 20px;- height: 20px;- border-radius: 50%;- border: 1.5px solid var(--ink-3);- position: relative;- justify-self: end;-}-.template[data-active="true"] .radio-mark {- border-color: var(--accent);- background: var(--accent);-}-.template[data-active="true"] .radio-mark::after {- content: "";- position: absolute;- left: 6.5px;- top: 3px;- width: 4px;- height: 8px;- border: solid #fff;- border-width: 0 2px 2px 0;- transform: rotate(45deg);-}--.template-icon {- width: 32px;- height: 32px;- border-radius: 8px;- background: var(--ink);- -webkit-mask-repeat: no-repeat;- mask-repeat: no-repeat;- -webkit-mask-position: center;- mask-position: center;- -webkit-mask-size: 26px;- mask-size: 26px;- opacity: 0.85;-}-.icon-qa-matrix {- -webkit-mask-image: radial-gradient(circle, #000 34%, transparent 36%);- mask-image: radial-gradient(circle, #000 34%, transparent 36%);- -webkit-mask-size: 9px 9px;- mask-size: 9px 9px;- -webkit-mask-repeat: repeat;- mask-repeat: repeat;- -webkit-mask-position: 2px 2px;- mask-position: 2px 2px;-}-.icon-parallel-build {- -webkit-mask-image: linear-gradient(- 180deg,- #000 0 22%,- transparent 22% 39%,- #000 39% 61%,- transparent 61% 78%,- #000 78% 100%- );- mask-image: linear-gradient(- 180deg,- #000 0 22%,- transparent 22% 39%,- #000 39% 61%,- transparent 61% 78%,- #000 78% 100%- );- -webkit-mask-size: 22px 20px;- mask-size: 22px 20px;-}-.icon-clean-browsers {- -webkit-mask-image: radial-gradient(circle, transparent 60%, #000 62% 72%, transparent 74%),- linear-gradient(90deg, transparent 47%, #000 47% 53%, transparent 53%),- linear-gradient(0deg, transparent 47%, #000 47% 53%, transparent 53%);- mask-image: radial-gradient(circle, transparent 60%, #000 62% 72%, transparent 74%),- linear-gradient(90deg, transparent 47%, #000 47% 53%, transparent 53%),- linear-gradient(0deg, transparent 47%, #000 47% 53%, transparent 53%);- -webkit-mask-size: 26px, 26px 20px, 20px 26px;- mask-size: 26px, 26px 20px, 20px 26px;-}-.icon-custom {- -webkit-mask-image: linear-gradient(90deg, #000 0 2px, transparent 2px 9px, #000 9px 11px, transparent 11px 18px, #000 18px 20px, transparent 20px);- mask-image: linear-gradient(90deg, #000 0 2px, transparent 2px 9px, #000 9px 11px, transparent 11px 18px, #000 18px 20px, transparent 20px);- -webkit-mask-size: 20px 22px;- mask-size: 20px 22px;-}--.template-detail {- padding: 0 14px 14px 60px;- display: flex;- flex-direction: column;- gap: 10px;- animation: notice-in var(--dur) var(--ease-out);-}-.template-description,-.template-empty {- margin: 0;- font-size: 12.5px;- color: var(--ink-2);-}-.member-chips {- list-style: none;- margin: 0;- padding: 0;- display: flex;- flex-wrap: wrap;- gap: 8px;-}-.chip {- display: inline-flex;- align-items: center;- gap: 8px;- height: 30px;- padding: 0 12px 0 10px;- border-radius: var(--radius-sm);- background: var(--fill);- border: 1px solid var(--hairline);- font-size: 12px;- font-weight: 500;-}-.os-glyph {- width: 12px;- height: 12px;- border-radius: 3px;- background: var(--ink-2);-}-.os-glyph.os-windows {- background: linear-gradient(90deg, #0a7aff 47%, transparent 47% 53%, #0a7aff 53%),- linear-gradient(0deg, #0a7aff 47%, transparent 47% 53%, #0a7aff 53%);- background-blend-mode: multiply;- background-color: transparent;- box-shadow: inset 0 0 0 1px transparent;-}-.os-glyph.os-macos {- border-radius: 50% 50% 45% 45%;- background: var(--ink);-}-.os-glyph.os-linux {- border-radius: 50%;- background: radial-gradient(circle at 50% 40%, #fff 0 25%, var(--ink) 27%);-}--.options {- display: flex;- flex-wrap: wrap;- gap: 10px 14px;- padding: 12px 0 0;- border-top: 1px solid var(--hairline);-}-.option {- display: flex;- flex-direction: column;- gap: 4px;- min-width: 140px;- flex: 1 1 140px;-}-.option-label {- font-size: 11px;- font-weight: 600;- letter-spacing: 0.04em;- text-transform: uppercase;- color: var(--ink-3);-}select {height: 30px;padding: 0 28px 0 10px;@@ -2420,73 +2182,6 @@ select {font: inherit;font-size: 12.5px;}-.option-count {- flex: 0 0 auto;- min-width: 0;-}-.stepper {- display: inline-flex;- align-items: center;- height: 30px;- border: 1px solid var(--hairline);- border-radius: var(--radius-sm);- background: var(--fill);- overflow: hidden;-}-.stepper button {- width: 30px;- height: 100%;- border: 0;- background: transparent;- font-size: 16px;- color: var(--ink-2);-}-.stepper button:hover:not(:disabled) {- background: var(--fill-hover);-}-.stepper button:disabled {- opacity: 0.35;-}-.stepper output {- min-width: 28px;- text-align: center;- font-weight: 600;- font-variant-numeric: tabular-nums;-}--.create-footer {- display: flex;- align-items: flex-end;- justify-content: space-between;- gap: 16px;- padding-top: 14px;- border-top: 1px solid var(--hairline);-}-.estimate {- display: flex;- flex-direction: column;- gap: 2px;- min-width: 0;-}-.estimate-main {- font-size: 14px;-}-.estimate-main strong {- font-weight: 600;-}-.estimate-detail {- font-size: 11.5px;- color: var(--ink-2);-}-.estimate-note {- font-size: 10.5px;- color: var(--ink-3);-}-.create-actions {- display: flex;- gap: 8px;- flex: none;-}.primary-button,.secondary-button {diff --git a/apps/cua-spaces/src/test/fakeFleet.ts b/apps/cua-spaces/src/test/fakeFleet.tsdeleted file mode 100644index b0c7bd0de9..0000000000--- a/apps/cua-spaces/src/test/fakeFleet.ts+++ /dev/null@@ -1,12 +0,0 @@-// SPDX-License-Identifier: FSL-1.1-MIT-// Copyright (c) 2026 Cua AI, Inc.--import { createFallbackFleetBridge, type FleetBridge } from "../native/fleet";--/**- * A FleetBridge for tests: every command rejects or no-ops like the browser- * fallback, then `overrides` supplies what a test actually drives.- */-export function fakeFleetBridge(overrides: Partial<FleetBridge> = {}): FleetBridge {- return { ...createFallbackFleetBridge(), ...overrides };-}diff --git a/apps/cua-spaces/src/test/fakeSpacesBridge.ts b/apps/cua-spaces/src/test/fakeSpacesBridge.tsnew file mode 100644index 0000000000..ea25af146a--- /dev/null+++ b/apps/cua-spaces/src/test/fakeSpacesBridge.ts@@ -0,0 +1,12 @@+// SPDX-License-Identifier: FSL-1.1-MIT+// Copyright (c) 2026 Cua AI, Inc.++import { createFallbackSpacesBridge, type SpacesBridge } from "../native/spacesBridge";++/**+ * A SpacesBridge for tests: every command rejects or no-ops like the browser+ * fallback, then `overrides` supplies what a test actually drives.+ */+export function fakeSpacesBridge(overrides: Partial<SpacesBridge> = {}): SpacesBridge {+ return { ...createFallbackSpacesBridge(), ...overrides };+}diff --git a/apps/cua-spaces/src/viewer/SpaceViewer.agentMenu.test.tsx b/apps/cua-spaces/src/viewer/SpaceViewer.agentMenu.test.tsxindex 3e2022f183..bbcfe8b0c1 100644--- a/apps/cua-spaces/src/viewer/SpaceViewer.agentMenu.test.tsx+++ b/apps/cua-spaces/src/viewer/SpaceViewer.agentMenu.test.tsx@@ -4,26 +4,26 @@import { act, fireEvent, render, screen } from "@testing-library/react";import { beforeEach, describe, expect, it, vi } from "vitest";-import type { FleetBridge, ViewerConfig } from "../native/fleet";+import type { SpacesBridge, ViewerConfig } from "../native/spacesBridge";import type { TransferBridge } from "../native/transfer";-import { fakeFleetBridge } from "../test/fakeFleet";+import { fakeSpacesBridge } from "../test/fakeSpacesBridge";import { SpaceViewer } from "./SpaceViewer";const SPACE = {- id: "cloud:aurora-1",+ id: "direct:aurora-1",name: "Aurora",};-function makeFleet(overrides: Partial<FleetBridge> = {}): FleetBridge {+function makeBridge(overrides: Partial<SpacesBridge> = {}): SpacesBridge {const config: ViewerConfig = { view: "space", space: SPACE };- return fakeFleetBridge({+ return fakeSpacesBridge({// A Space without desktop_stream shows the "update the image" message// instead of streaming, so the bar renders without a WebSocket.listSpaces: async () => [{id: SPACE.id,name: "aurora-1",- provider: "cloud",+ provider: "direct",spacesdVersion: "0",features: [],reachable: true,@@ -46,8 +46,8 @@ const TRANSFER: TransferBridge = {onTransfer: async () => () => {},};-async function openMenu(fleet: FleetBridge) {- render(<SpaceViewer fleet={fleet} transfer={TRANSFER} />);+async function openMenu(bridge: SpacesBridge) {+ render(<SpaceViewer bridge={bridge} transfer={TRANSFER} />);const trigger = await screen.findByRole("button", { name: /launch agent/i });fireEvent.click(trigger);return trigger;@@ -59,7 +59,7 @@ describe("SpaceViewer Launch Agent dropdown", () => {});it("opens the menu and lists every launchable coding agent in order", async () => {- await openMenu(makeFleet());+ await openMenu(makeBridge());const items = screen.getAllByRole("menuitem").map((el) => el.textContent);expect(items).toEqual(["Claude Code",@@ -74,22 +74,22 @@ describe("SpaceViewer Launch Agent dropdown", () => {});it("does not offer Google Antigravity, which has no interactive terminal", async () => {- await openMenu(makeFleet());+ await openMenu(makeBridge());expect(screen.queryByRole("menuitem", { name: /antigravity/i })).toBeNull();});it("launches Claude Code via its teleport provider", async () => {- const fleet = makeFleet();- await openMenu(fleet);+ const bridge = makeBridge();+ await openMenu(bridge);fireEvent.click(screen.getByRole("menuitem", { name: "Claude Code" }));- expect(fleet.launchAgent).toHaveBeenCalledTimes(1);- expect(fleet.launchAgent).toHaveBeenCalledWith(+ expect(bridge.launchAgent).toHaveBeenCalledTimes(1);+ expect(bridge.launchAgent).toHaveBeenCalledWith(expect.objectContaining({ id: SPACE.id }),"claude-code","Claude Code",);- expect(fleet.launchAgentTerminal).not.toHaveBeenCalled();+ expect(bridge.launchAgentTerminal).not.toHaveBeenCalled();// Selecting closes the menu.expect(screen.queryByRole("menu")).toBeNull();});@@ -103,16 +103,16 @@ describe("SpaceViewer Launch Agent dropdown", () => {["Hermes", "hermes"],["OpenClaw", "openclaw"],])("opens %s in a terminal in the Space", async (name, harness) => {- const fleet = makeFleet();- await openMenu(fleet);+ const bridge = makeBridge();+ await openMenu(bridge);fireEvent.click(screen.getByRole("menuitem", { name }));- expect(fleet.launchAgentTerminal).toHaveBeenCalledTimes(1);- expect(fleet.launchAgentTerminal).toHaveBeenCalledWith(+ expect(bridge.launchAgentTerminal).toHaveBeenCalledTimes(1);+ expect(bridge.launchAgentTerminal).toHaveBeenCalledWith(expect.objectContaining({ id: SPACE.id }),harness,);- expect(fleet.launchAgent).not.toHaveBeenCalled();+ expect(bridge.launchAgent).not.toHaveBeenCalled();expect(await screen.findByText(`${name} is open in a terminal in this Space; sign in there`),).toBeInTheDocument();@@ -120,7 +120,7 @@ describe("SpaceViewer Launch Agent dropdown", () => {it("keeps an installing notice up until the terminal opens", async () => {let finish: () => void = () => {};- const fleet = makeFleet({+ const bridge = makeBridge({launchAgentTerminal: vi.fn(() =>new Promise<void>((resolve) => {@@ -128,7 +128,7 @@ describe("SpaceViewer Launch Agent dropdown", () => {}),),});- await openMenu(fleet);+ await openMenu(bridge);fireEvent.click(screen.getByRole("menuitem", { name: "Goose" }));expect(await screen.findByText("Installing Goose in this Space…")).toBeInTheDocument();@@ -139,12 +139,12 @@ describe("SpaceViewer Launch Agent dropdown", () => {});it("says why when a terminal launch fails", async () => {- const fleet = makeFleet({+ const bridge = makeBridge({launchAgentTerminal: vi.fn(async () => {throw new Error("this Space has no xterm to open it in");}),});- await openMenu(fleet);+ await openMenu(bridge);fireEvent.click(screen.getByRole("menuitem", { name: "Hermes" }));expect(await screen.findByText("Couldn't open Hermes: this Space has no xterm to open it in"),diff --git a/apps/cua-spaces/src/viewer/SpaceViewer.local.test.tsx b/apps/cua-spaces/src/viewer/SpaceViewer.local.test.tsxindex 6870e63197..e1d2a59400 100644--- a/apps/cua-spaces/src/viewer/SpaceViewer.local.test.tsx+++ b/apps/cua-spaces/src/viewer/SpaceViewer.local.test.tsx@@ -5,9 +5,9 @@ import { render, screen, waitFor } from "@testing-library/react";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import type { SpaceRow } from "../model/spaces";-import type { FleetBridge, ViewerConfig } from "../native/fleet";+import type { SpacesBridge, ViewerConfig } from "../native/spacesBridge";import type { TransferBridge } from "../native/transfer";-import { fakeFleetBridge } from "../test/fakeFleet";+import { fakeSpacesBridge } from "../test/fakeSpacesBridge";import { hasDesktopStream, NO_DESKTOP_STREAM_MESSAGE, phaseForStatus, SpaceViewer } from "./SpaceViewer";/** Records every WebSocket the viewer opens (never connects anywhere). */@@ -30,7 +30,7 @@ function row(id: string, features: string[]): SpaceRow {return { id, name: "x", provider: "direct", spacesdVersion: "0", features, reachable: true };}-function fleetWith(config: ViewerConfig, rows: SpaceRow[], extra: Partial<FleetBridge> = {}) {+function bridgeWith(config: ViewerConfig, rows: SpaceRow[], extra: Partial<SpacesBridge> = {}) {const openStream = vi.fn(async () => ({spaceId: config.space.id,mediaSessionId: "m-1",@@ -42,14 +42,14 @@ function fleetWith(config: ViewerConfig, rows: SpaceRow[], extra: Partial<FleetBvia: "direct" as const,audio: true,}));- const fleet = fakeFleetBridge({+ const bridge = fakeSpacesBridge({isNative: true,viewerConfig: async () => config,listSpaces: async () => rows,openStream,...extra,});- return { fleet, openStream };+ return { bridge, openStream };}const TRANSFER: TransferBridge = {@@ -78,16 +78,16 @@ afterEach(() => {describe("SpaceViewer transport", () => {it("streams the spacesd DESKTOP when the Space has desktop_stream", async () => {const config: ViewerConfig = { view: "space", space: { id: "space://direct/10.0.0.5:3211", name: "Box" } };- const { fleet, openStream } = fleetWith(config, [row(config.space.id, ["desktop_stream"])]);- render(<SpaceViewer fleet={fleet} transfer={TRANSFER} />);+ const { bridge, openStream } = bridgeWith(config, [row(config.space.id, ["desktop_stream"])]);+ render(<SpaceViewer bridge={bridge} transfer={TRANSFER} />);await waitFor(() => expect(RecordingSocket.urls).toContain("ws://10.0.0.5:3211/media?ticket=abc"));expect(openStream).toHaveBeenCalledWith(config.space.id, { kind: "display" }, { audio: true });});it("opens the PiP mirror view-only with no audio", async () => {const config: ViewerConfig = { view: "pip", space: { id: "space://direct/h:1", name: "Box" } };- const { fleet, openStream } = fleetWith(config, [row(config.space.id, ["desktop_stream"])]);- render(<SpaceViewer fleet={fleet} transfer={TRANSFER} />);+ const { bridge, openStream } = bridgeWith(config, [row(config.space.id, ["desktop_stream"])]);+ render(<SpaceViewer bridge={bridge} transfer={TRANSFER} />);await waitFor(() => expect(openStream).toHaveBeenCalled());expect(openStream).toHaveBeenCalledWith(config.space.id,@@ -98,8 +98,8 @@ describe("SpaceViewer transport", () => {it("shows an update-the-image message when the Space lacks desktop_stream", async () => {const config: ViewerConfig = { view: "space", space: { id: "space://direct/10.0.0.5:3211", name: "Old" } };- const { fleet, openStream } = fleetWith(config, [row(config.space.id, ["window_stream"])]);- render(<SpaceViewer fleet={fleet} transfer={TRANSFER} />);+ const { bridge, openStream } = bridgeWith(config, [row(config.space.id, ["window_stream"])]);+ render(<SpaceViewer bridge={bridge} transfer={TRANSFER} />);expect(await screen.findByRole("alert")).toHaveTextContent(NO_DESKTOP_STREAM_MESSAGE);expect(openStream).not.toHaveBeenCalled();expect(RecordingSocket.urls).toEqual([]);@@ -108,11 +108,11 @@ describe("SpaceViewer transport", () => {describe("hasDesktopStream / phaseForStatus", () => {it("prefers the stream when the registry is unavailable or the Space is unknown", async () => {- const failing = fakeFleetBridge({ listSpaces: async () => Promise.reject(new Error("down")) });+ const failing = fakeSpacesBridge({ listSpaces: async () => Promise.reject(new Error("down")) });await expect(hasDesktopStream(failing, "space://direct/a:1")).resolves.toBe(true);- const empty = fakeFleetBridge({ listSpaces: async () => [] });+ const empty = fakeSpacesBridge({ listSpaces: async () => [] });await expect(hasDesktopStream(empty, "space://direct/a:1")).resolves.toBe(true);- const old = fakeFleetBridge({ listSpaces: async () => [row("space://direct/a:1", ["window_stream"])] });+ const old = fakeSpacesBridge({ listSpaces: async () => [row("space://direct/a:1", ["window_stream"])] });await expect(hasDesktopStream(old, "space://direct/a:1")).resolves.toBe(false);});diff --git a/apps/cua-spaces/src/viewer/SpaceViewer.tsx b/apps/cua-spaces/src/viewer/SpaceViewer.tsxindex cddf38ef86..05d26d19a1 100644--- a/apps/cua-spaces/src/viewer/SpaceViewer.tsx+++ b/apps/cua-spaces/src/viewer/SpaceViewer.tsx@@ -30,7 +30,7 @@ import {transferTitle,type TransferOverlayState,} from "../model/transfer";-import type { FleetBridge, HotspotStatus, ViewerConfig } from "../native/fleet";+import type { SpacesBridge, HotspotStatus, ViewerConfig } from "../native/spacesBridge";import { createTransferBridge, type TransferBridge } from "../native/transfer";import { HotspotGlyph } from "../components/HotspotGlyph";import type { MediaStatus, MediaTicket } from "@cua/spacesd-html5/core/mediaSession";@@ -40,7 +40,7 @@ import { PresenceOverlay } from "./presence/PresenceOverlay";import { useT } from "../i18n";interface SpaceViewerProps {- fleet: FleetBridge;+ bridge: SpacesBridge;/** Transfer overlay bridge; defaults to the environment-appropriate one. */transfer?: TransferBridge;}@@ -57,11 +57,11 @@ export const NO_DESKTOP_STREAM_MESSAGE =/** Whether the Space can stream its desktop. False only when the registry* says its spacesd lacks `desktop_stream`; an unknown Space (registry* unavailable) still tries the stream. */-export async function hasDesktopStream(fleet: FleetBridge, spaceId: string): Promise<boolean> {+export async function hasDesktopStream(bridge: SpacesBridge, spaceId: string): Promise<boolean> {try {- const row = fleet.spaceInfo- ? await fleet.spaceInfo(spaceId)- : (await fleet.listSpaces()).find((r) => r.id === spaceId);+ const row = bridge.spaceInfo+ ? await bridge.spaceInfo(spaceId)+ : (await bridge.listSpaces()).find((r) => r.id === spaceId);if (row && !row.features.includes(FEATURE.desktopStream)) return false;} catch {// registry unavailable: try the stream@@ -104,7 +104,7 @@ const CODING_AGENTS: readonly CodingAgent[] = [// a headless ACP server), so it runs through the SDK, `cua agent run` and MCP.];-export function SpaceViewer({ fleet, transfer }: SpaceViewerProps) {+export function SpaceViewer({ bridge, transfer }: SpaceViewerProps) {const t = useT(["spaces", "common", "errors"]);const [boot, setBoot] = useState<Boot>({ kind: "loading" });const transferBridge = useMemo(() => transfer ?? createTransferBridge(), [transfer]);@@ -113,10 +113,10 @@ export function SpaceViewer({ fleet, transfer }: SpaceViewerProps) {useEffect(() => {let cancelled = false;- fleet+ bridge.viewerConfig().then(async (config) => {- const desktopStream = await hasDesktopStream(fleet, config.space.id);+ const desktopStream = await hasDesktopStream(bridge, config.space.id);if (!cancelled) setBoot({ kind: "ready", config, desktopStream });}).catch((error: unknown) => {@@ -129,7 +129,7 @@ export function SpaceViewer({ fleet, transfer }: SpaceViewerProps) {return () => {cancelled = true;};- }, [fleet]);+ }, [bridge]);if (boot.kind === "loading") {return <div className="viewer viewer-message">{t("common.status.connecting")}</div>;@@ -139,7 +139,7 @@ export function SpaceViewer({ fleet, transfer }: SpaceViewerProps) {}return (<ViewerSession- fleet={fleet}+ bridge={bridge}transfer={transferBridge}config={boot.config}desktopStream={boot.desktopStream}@@ -164,12 +164,12 @@ export function phaseForStatus(status: MediaStatus): Phase {}function ViewerSession({- fleet,+ bridge,transfer,config,desktopStream,}: {- fleet: FleetBridge;+ bridge: SpacesBridge;transfer: TransferBridge;config: ViewerConfig;desktopStream: boolean;@@ -185,14 +185,14 @@ function ViewerSession({const { space, view } = config;const openDesktop = useMemo(() => (): Promise<MediaTicket> =>- fleet+ bridge.openStream(space.id,{ kind: "display" },view === "pip" ? { policy: "view_only", audio: false, maxDimension: 1280 } : { audio: true },).then(toMediaTicket),- [fleet, space.id, view],+ [bridge, space.id, view],);// Item D: a recent screenshot (from the shared cache, via viewer_config)// paints a blurred background while the live stream is connecting.@@ -244,7 +244,7 @@ function ViewerSession({return () => window.clearTimeout(timer);}, [topbarNotice]);const openTeleport = () => {- void fleet.openTeleportPicker(space).catch(() => {});+ void bridge.openTeleportPicker(space).catch(() => {});};// The "Launch Agent" dropdown: a button in the bar that opens a small dark@@ -295,7 +295,7 @@ function ViewerSession({}if (agent.launch === "teleport") {// Straight to the teleport consent sheet for this agent's provider.- void fleet.launchAgent(space, agent.id, agent.name).catch(() => {});+ void bridge.launchAgent(space, agent.id, agent.name).catch(() => {});return;}if (agentInstalling) {@@ -303,7 +303,7 @@ function ViewerSession({return;}setAgentInstalling(agent.name);- fleet+ bridge.launchAgentTerminal(space, agent.id).then(() => setTopbarNotice(t("spaces.viewer.agent_opened", { agent: agent.name }))).catch((error: unknown) =>@@ -323,13 +323,13 @@ function ViewerSession({let unsub: (() => void) | undefined;const reflect = (status: HotspotStatus) =>setHotspotOn(status.active && status.spaceId === space.id);- void fleet+ void bridge.hotspotStatus().then((status) => {if (!cancelled) reflect(status);}).catch(() => {});- void fleet.onHotspotChanged(reflect).then((off) => {+ void bridge.onHotspotChanged(reflect).then((off) => {if (cancelled) off();else unsub = off;});@@ -337,9 +337,9 @@ function ViewerSession({cancelled = true;unsub?.();};- }, [fleet, space.id]);+ }, [bridge, space.id]);const stopHotspot = () => {- void fleet.stopHotspot().catch(() => setTopbarNotice(t("errors.viewer.stop_hotspot_failed")));+ void bridge.stopHotspot().catch(() => setTopbarNotice(t("errors.viewer.stop_hotspot_failed")));};// Keep the Space window at the remote desktop's aspect ratio while windowed.@@ -371,8 +371,8 @@ function ViewerSession({// only when the resolution changes.useEffect(() => {if (view !== "pip" || phase !== "connected" || !frameSize) return;- void fleet.setPipAspect(space.id, frameSize.width, frameSize.height).catch(() => {});- }, [view, phase, frameSize, fleet, space.id]);+ void bridge.setPipAspect(space.id, frameSize.width, frameSize.height).catch(() => {});+ }, [view, phase, frameSize, bridge, space.id]);// The PiP window is FullScreenAuxiliary, so its green traffic-light zooms// (Tauri reports it as maximized) rather than entering fullscreen. Repurpose@@ -391,8 +391,8 @@ function ViewerSession({if (disposed || maximized === wasMaximized) return;wasMaximized = maximized;if (maximized) {- void fleet.openSpaceWindow(space).catch(() => {});- void fleet.unpinSpacePip(space.id).catch(() => {});+ void bridge.openSpaceWindow(space).catch(() => {});+ void bridge.unpinSpacePip(space.id).catch(() => {});}});});@@ -403,7 +403,7 @@ function ViewerSession({disposed = true;unlisten?.();};- }, [view, fleet, space, space.id]);+ }, [view, bridge, space, space.id]);const retry = () => setAttempt((current) => current + 1);diff --git a/apps/cua-spaces/src/viewer/WindowStream.test.tsx b/apps/cua-spaces/src/viewer/WindowStream.test.tsxindex 3598e1c8be..93167d8c80 100644--- a/apps/cua-spaces/src/viewer/WindowStream.test.tsx+++ b/apps/cua-spaces/src/viewer/WindowStream.test.tsx@@ -5,8 +5,8 @@ import { act, render, screen } from "@testing-library/react";import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import type { RemoteWindow } from "../model/teleport";-import type { ViewerConfig } from "../native/fleet";-import { fakeFleetBridge } from "../test/fakeFleet";+import type { ViewerConfig } from "../native/spacesBridge";+import { fakeSpacesBridge } from "../test/fakeSpacesBridge";import { avcCodecFromAnnexB } from "@cua/spacesd-html5/core/h264";import {applyCursorShape,@@ -163,7 +163,7 @@ describe("WindowStream", () => {mediaSessionId: "m-9",},};- render(<WindowStream fleet={fakeFleetBridge({ viewerConfig: async () => config, openStream })} />);+ render(<WindowStream bridge={fakeSpacesBridge({ viewerConfig: async () => config, openStream })} />);await screen.findByText(/Connecting to Firefox/);// The canvas opens its socket after the status text renders.await vi.waitFor(() => expect(RecordingSocket.urls).toEqual(["ws://h:1/media?ticket=from-mcp"]));@@ -189,7 +189,7 @@ describe("WindowStream", () => {targetWindow: { id: "w-7", appName: "Firefox", title: "Docs" },};const { unmount } = render(- <WindowStream fleet={fakeFleetBridge({ viewerConfig: async () => primary, openStream })} />,+ <WindowStream bridge={fakeSpacesBridge({ viewerConfig: async () => primary, openStream })} />,);await vi.waitFor(() => expect(openStream).toHaveBeenCalled());expect(openStream).toHaveBeenLastCalledWith(@@ -201,7 +201,7 @@ describe("WindowStream", () => {unmount();const replica: ViewerConfig = { ...primary, targetWindow: { ...primary.targetWindow!, replica: true } };- render(<WindowStream fleet={fakeFleetBridge({ viewerConfig: async () => replica, openStream })} />);+ render(<WindowStream bridge={fakeSpacesBridge({ viewerConfig: async () => replica, openStream })} />);await vi.waitFor(() => expect(openStream).toHaveBeenCalledTimes(2));expect(openStream).toHaveBeenLastCalledWith("space://direct/h:1",@@ -229,7 +229,7 @@ describe("WindowStream", () => {const config: ViewerConfig = { view: "windows", space: { id: "space://direct/h:1", name: "Box" } };render(<WindowStream- fleet={fakeFleetBridge({ viewerConfig: async () => config, openStream: openStream as never })}+ bridge={fakeSpacesBridge({ viewerConfig: async () => config, openStream: openStream as never })}listWindows={listWindows}/>,);diff --git a/apps/cua-spaces/src/viewer/WindowStream.tsx b/apps/cua-spaces/src/viewer/WindowStream.tsxindex 0f69f4ee16..85b1d79f21 100644--- a/apps/cua-spaces/src/viewer/WindowStream.tsx+++ b/apps/cua-spaces/src/viewer/WindowStream.tsx@@ -22,12 +22,12 @@ import { useEffect, useRef, useState } from "react";import type { RemoteWindow } from "../model/teleport";import type {- FleetBridge,+ SpacesBridge,StreamOpts,StreamTarget,StreamTicketInfo,ViewerConfig,-} from "../native/fleet";+} from "../native/spacesBridge";import { createTeleportBridge } from "../native/teleport";import { telemetryBridge, type TelemetryBridge } from "../native/telemetry";import { PresenceOverlay } from "./presence/PresenceOverlay";@@ -167,7 +167,7 @@ export function MediaCanvas(props: MediaCanvasProps) {// ---------------------------------------------------------------- WindowStreaminterface WindowStreamProps {- fleet: FleetBridge;+ bridge: SpacesBridge;/** The Space's window list (multi mode); defaults to the shell's. */listWindows?: (spaceId: string) => Promise<RemoteWindow[]>;}@@ -177,13 +177,13 @@ type Boot =| { kind: "error"; message: string }| { kind: "ready"; config: ViewerConfig };-export function WindowStream({ fleet, listWindows }: WindowStreamProps) {+export function WindowStream({ bridge, listWindows }: WindowStreamProps) {const t = useT(["spaces", "common"]);const [boot, setBoot] = useState<Boot>({ kind: "loading" });useEffect(() => {let cancelled = false;- fleet+ bridge.viewerConfig().then((config) => {if (!cancelled) setBoot({ kind: "ready", config });@@ -195,17 +195,17 @@ export function WindowStream({ fleet, listWindows }: WindowStreamProps) {return () => {cancelled = true;};- }, [fleet]);+ }, [bridge]);if (boot.kind === "loading") return <div className="viewer viewer-message">{t("common.status.connecting")}</div>;if (boot.kind === "error") {return <div className="viewer viewer-message viewer-error">{boot.message}</div>;}return boot.config.targetWindow ? (- <SingleWindowStream fleet={fleet} config={boot.config} />+ <SingleWindowStream bridge={bridge} config={boot.config} />) : (<MultiWindowStream- fleet={fleet}+ bridge={bridge}config={boot.config}listWindows={listWindows ?? ((id) => createTeleportBridge().listRemoteWindows(id))}/>@@ -217,7 +217,7 @@ async function currentWindow() {return getCurrentWindow();}-function SingleWindowStream({ fleet, config }: { fleet: FleetBridge; config: ViewerConfig }) {+function SingleWindowStream({ bridge, config }: { bridge: SpacesBridge; config: ViewerConfig }) {const t = useT(["spaces", "common"]);const target = config.targetWindow!;const space = config.space;@@ -231,7 +231,7 @@ function SingleWindowStream({ fleet, config }: { fleet: FleetBridge; config: Vieconst replica = target.replica === true;const open = useRef<() => Promise<MediaTicket>>(() =>- fleet+ bridge.openStream(space.id, { kind: "window", windowId: target.id } satisfies StreamTarget, {...(replica ? REPLICA_OPTS : PRIMARY_WINDOW_OPTS),geometryControl: !replica,@@ -290,7 +290,7 @@ function SingleWindowStream({ fleet, config }: { fleet: FleetBridge; config: Vieapplied.current.guard = false;}, RESIZE_DEBOUNCE_MS + 150);applied.current = { w, h, guard: true, timer };- void fleet.resizeStreamWindow(w, h).catch(() => {});+ void bridge.resizeStreamWindow(w, h).catch(() => {});};return (@@ -370,11 +370,11 @@ export function selectWindows(windows: readonly RemoteWindow[], cap = MAX_WINDOW}function MultiWindowStream({- fleet,+ bridge,config,listWindows,}: {- fleet: FleetBridge;+ bridge: SpacesBridge;config: ViewerConfig;listWindows: (spaceId: string) => Promise<RemoteWindow[]>;}) {@@ -413,7 +413,7 @@ function MultiWindowStream({<div className="window-stream" data-status={status}><div className="window-stream-surface">{windows.map((win, index) => (- <WindowPanel key={win.id} fleet={fleet} spaceId={space.id} win={win} index={index} />+ <WindowPanel key={win.id} bridge={bridge} spaceId={space.id} win={win} index={index} />))}</div>{status === "waiting" && (@@ -432,12 +432,12 @@ function MultiWindowStream({}function WindowPanel({- fleet,+ bridge,spaceId,win,index,}: {- fleet: FleetBridge;+ bridge: SpacesBridge;spaceId: string;win: RemoteWindow;index: number;@@ -450,7 +450,7 @@ function WindowPanel({const [z, setZ] = useState(1);const sessionRef = useRef<MediaSession | null>(null);const open = useRef(() =>- fleet.openStream(spaceId, { kind: "window", windowId: win.id }, PRIMARY_WINDOW_OPTS).then(toMediaTicket),+ bridge.openStream(spaceId, { kind: "window", windowId: win.id }, PRIMARY_WINDOW_OPTS).then(toMediaTicket),).current;if (closed) return null;@@ -481,7 +481,7 @@ function WindowPanel({aria-label={t("spaces.window_stream.close_window")}onClick={() => {const id = sessionRef.current?.id;- if (id) void fleet.closeStream(spaceId, id).catch(() => {});+ if (id) void bridge.closeStream(spaceId, id).catch(() => {});setClosed(true);}}>diff --git a/libs/cua/crates/cua-spaces-app-core/parity/agents-page.json b/libs/cua/crates/cua-spaces-app-core/parity/agents-page.jsonindex 863754160f..e249f65293 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/agents-page.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/agents-page.json@@ -15,7 +15,7 @@{"name": "bob","harness": "claude-code",- "space": "cloud:bob",+ "space": "direct:bob","paused": true,"spaceState": "released","savedMs": 1789900000000@@ -308,7 +308,7 @@{"name": "bob","harness": "claude-code",- "space": "cloud:bob",+ "space": "direct:bob","paused": true,"spaceState": "released","savedMs": 1789900000000diff --git a/libs/cua/crates/cua-spaces-app-core/parity/create-gpu.json b/libs/cua/crates/cua-spaces-app-core/parity/create-gpu.jsonindex 6abc6a1610..a22b56d23a 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/create-gpu.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/create-gpu.json@@ -4,7 +4,6 @@"now": 1800000000000,"env": {"defaultLocation": "local",- "cloudAvailable": false,"localAvailable": true,"localReason": null,"localBackends": [diff --git a/libs/cua/crates/cua-spaces-app-core/parity/create-resources.json b/libs/cua/crates/cua-spaces-app-core/parity/create-resources.jsonindex ceb9f9809e..d67e2eb8c3 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/create-resources.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/create-resources.json@@ -1,9 +1,8 @@{"name": "create-resources",- "about": "The Resources step: kind, architecture (emulated off this Mac's platform), the disk (a slider where the guest grows it) with the download and the room left where it is written, a Space that does not fit blocking Continue, the cloud tile refusing a pick while it is coming soon (its lines, sliders and price are unit-tested), the local sliders (local is free), and a grown macOS disk in the plan, and a value typed into a slider's number (used within the slider's limits, refused with the slider's words outside them).",+ "about": "The Resources step: kind, architecture (emulated off this Mac's platform), the disk (a slider where the guest grows it) with the download and the room left where it is written, a Space that does not fit blocking Continue, the local sliders (local is free), and a grown macOS disk in the plan, and a value typed into a slider's number (used within the slider's limits, refused with the slider's words outside them).","env": {"defaultLocation": "local",- "cloudAvailable": true,"localAvailable": true,"localReason": null,"localBackends": ["docker", "lume", "qemu"],@@ -31,10 +30,6 @@"pulled": ["ghcr.io/trycua/linux:24.04-slim"]- },- "cloudPricing": {- "vcpuHourUsd": 0.044625,- "memoryGibHourUsd": 0.0223125}},"wizard": [@@ -129,10 +124,6 @@{"type": "back"},- {- "type": "set-placement",- "placement": "cloud"- },{"type": "next"},diff --git a/libs/cua/crates/cua-spaces-app-core/parity/create-space.json b/libs/cua/crates/cua-spaces-app-core/parity/create-space.jsonindex b7bc857b9b..293251a76e 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/create-space.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/create-space.json@@ -1,9 +1,8 @@{"name": "create-space",- "about": "New Space wizard (the cloud tile is coming soon and refuses a pick; every field, label and the image field with its suggestions, a custom image ref and Connect by address) to a local plan, then the roster picks the Space up and the window selects it.",+ "about": "New Space wizard (every field, label and the image field with its suggestions, a custom image ref and Connect by address) to a local plan, then the roster picks the Space up and the window selects it.","env": {"defaultLocation": "local",- "cloudAvailable": false,"localAvailable": true,"localReason": null,"localBackends": [@@ -21,10 +20,6 @@"type": "choose-os","os": "linux"},- {- "type": "set-placement",- "placement": "cloud"- },{"type": "set-placement","placement": "local"diff --git a/libs/cua/crates/cua-spaces-app-core/parity/experiments.json b/libs/cua/crates/cua-spaces-app-core/parity/experiments.jsonindex 208d542529..ba1fb8fa40 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/experiments.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/experiments.json@@ -19,7 +19,6 @@"canSignOut": true,"signIn": { "kind": "idle" },"menuBar": false,- "defaultLocation": "local","telemetry": { "enabled": true },"agents": [],"loginItem": { "status": "enabled" }@@ -57,7 +56,6 @@},"env": {"defaultLocation": "local",- "cloudAvailable": false,"localAvailable": true,"localReason": null,"localBackends": ["docker"],@@ -65,7 +63,6 @@"maxCpus": 8,"hostArch": "arm64","storage": null,- "cloudPricing": null,"hosts": [{ "id": "m-mini", "name": "Mac mini", "via": "relay", "online": true, "os": "macos", "limits": [] }],diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/agents-page.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/agents-page.jsonindex 8f20aef100..88b5d6b811 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/agents-page.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/agents-page.json@@ -11,7 +11,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -47,7 +47,7 @@"request": "load ada","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -90,7 +90,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -133,7 +133,7 @@"request": "read agents/ada/hermes/memories/MEMORY.md","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -184,7 +184,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -235,7 +235,7 @@"request": "restore agents/ada/hermes/memories/MEMORY.md v1","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -278,7 +278,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -321,7 +321,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -364,7 +364,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -407,7 +407,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -450,7 +450,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -493,7 +493,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -536,7 +536,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -579,7 +579,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -622,7 +622,7 @@"request": "add routine ada \"Inbox sweep\" every 30","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -666,7 +666,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -710,7 +710,7 @@"request": "routine R1 off","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -754,7 +754,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -798,7 +798,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -842,7 +842,7 @@"request": "allow ada on relay:0123456789abcdef","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -886,7 +886,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -930,7 +930,7 @@"request": "allow ada on relay:0123456789abcdef","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -976,7 +976,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -1022,7 +1022,7 @@"request": "revoke ada on relay:0123456789abcdef","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -1066,7 +1066,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -1110,7 +1110,7 @@"request": "pause ada","rows": ["ada | Hermes in local:dev | Running | Pause (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -1154,7 +1154,7 @@"request": null,"rows": ["ada | Hermes in local:dev | Paused | Resume (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}@@ -1198,7 +1198,7 @@"request": "resume bob","rows": ["ada | Hermes in local:dev | Paused | Resume (selected)",- "bob | Claude Code in cloud:bob | Paused | Resume"+ "bob | Claude Code in direct:bob | Paused | Resume"],"title": "Agents"}diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-cancel.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-cancel.jsonindex cc8e0da79d..516220d84b 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-cancel.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-cancel.json@@ -34,7 +34,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: macOS",@@ -76,7 +75,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading macOS (first time only)…","System: macOS",@@ -118,7 +116,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading macOS (first time only)…","System: macOS",@@ -160,7 +157,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Cancelling… 18%","System: macOS",@@ -202,7 +198,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Cancelling… 18%","System: macOS",@@ -244,7 +239,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Cancelling… 18%","System: macOS",@@ -301,7 +295,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: Linux"@@ -342,7 +335,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image…","System: Linux"@@ -383,7 +375,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Cancelling… 42%","System: Linux"@@ -424,7 +415,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","System: Linux"diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-progress.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-progress.jsonindex b8a37fe3a2..7f64f2a03c 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-progress.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-progress.json@@ -34,7 +34,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -78,7 +77,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -122,7 +120,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -166,7 +163,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -210,7 +206,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 1%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -254,7 +249,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 10%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -298,7 +292,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 36%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -342,7 +335,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 36%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -386,7 +378,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 36%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -430,7 +421,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 36%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -474,7 +464,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 52%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -518,7 +507,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 85%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -562,7 +550,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 96%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -606,7 +593,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 96%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -650,7 +636,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -672,7 +657,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 96%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -719,7 +703,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Creating the container… 5%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -741,7 +724,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 96%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -788,7 +770,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Creating the container… 12%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -810,7 +791,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 96%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -857,7 +837,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Creating the container… 12%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -879,7 +858,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -926,7 +904,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 17%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -948,7 +925,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -995,7 +971,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 83%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1017,7 +992,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1064,7 +1038,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 83%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1086,7 +1059,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 98%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1133,7 +1105,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 83%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1155,7 +1126,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1202,7 +1172,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 90%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1224,7 +1193,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1271,7 +1239,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 90%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1293,7 +1260,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Image: ghcr.io/trycua/omarchy:edge [copy ghcr.io/trycua/omarchy:edge doc.on.doc Copy / checkmark Copied 1500ms]",diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-resources.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-resources.jsonindex 36b5515051..e9ef9ae5f0 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-resources.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-resources.json@@ -1556,65 +1556,6 @@},"wizard": "back"},- {- "frame": {- "address": {- "canSubmit": false,- "error": null,- "submit": null,- "submitLabel": "Add Space"- },- "canContinue": true,- "cpusText": "2 cores",- "disk": "20 GB (20-500) ~Uses about 1.7 GB on this Mac at first, up to 20 GB as the Space fills it. ?A VM disk cannot shrink below the image's 20 GB.",- "fields": [- "os: System",- "image: Image [ghcr.io/org/app:tag]",- "placement: Run on",- "kind: Kind (advanced)",- "runtime: Runtime (advanced)",- "connect-cloud: Connect a cloud…",- "connect-by-address: Connect by address…"- ],- "gpu": null,- "image": "ghcr.io/trycua/omarchy:edge",- "imageField": {- "custom": false,- "error": null,- "open": false,- "rows": [],- "text": "ghcr.io/trycua/omarchy:edge"- },- "kinds": [- "vm"- ],- "labels": "Cancel | Back | Advanced",- "memoryText": "4 GB",- "nameInvalid": false,- "placement": "local",- "placementError": null,- "placements": [- "local"- ],- "price": null,- "primaryLabel": "Continue",- "ranges": "cpus 1-8, memory 2-16",- "resourceFacts": [- "Kind: Virtual machine",- "Architecture: x64 [exclamationmark.triangle ?Emulated on this Mac’s ARM processor. Performance may be degraded.]",- "Download: 1.7 GB",- "Available: 212 GB on Macintosh HD"- ],- "resourcesError": null,- "runtime": "auto",- "runtimes": [- "auto",- "qemu"- ],- "step": 0- },- "wizard": "set-placement"- },{"frame": {"address": {diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-retry.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-retry.jsonindex 3e671dba2b..28c2b23b59 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-retry.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-retry.json@@ -34,7 +34,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: Linux",@@ -76,7 +75,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Setting up Linux runtime… 2%","System: Linux",@@ -118,7 +116,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Retrying… 1%","System: Linux",@@ -160,7 +157,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Retrying… 5%","System: Linux",@@ -202,7 +198,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Retrying… 5%","System: Linux",@@ -244,7 +239,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","System: Linux",@@ -302,7 +296,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -345,7 +338,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -403,7 +395,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -446,7 +437,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -505,7 +495,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -548,7 +537,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -591,7 +579,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -612,7 +599,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -658,7 +644,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -679,7 +664,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -725,7 +709,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",@@ -746,7 +729,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","Image: ghcr.io/trycua/macos:26 [copy ghcr.io/trycua/macos:26 doc.on.doc Copy / checkmark Copied 1500ms]",diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-space.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-space.jsonindex 671e8e9c93..b0c213d857 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-space.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-space.json@@ -235,65 +235,6 @@},"wizard": "set-placement"},- {- "frame": {- "address": {- "canSubmit": false,- "error": null,- "submit": null,- "submitLabel": "Add Space"- },- "canContinue": true,- "cpusText": "2 cores",- "disk": null,- "fields": [- "os: System",- "image: Image [ghcr.io/org/app:tag]",- "placement: Run on",- "kind: Kind (advanced)",- "runtime: Runtime (advanced)",- "connect-cloud: Connect a cloud…",- "connect-by-address: Connect by address…"- ],- "gpu": null,- "image": "ghcr.io/trycua/linux:24.04",- "imageField": {- "custom": false,- "error": null,- "open": false,- "rows": [],- "text": "ghcr.io/trycua/linux:24.04"- },- "kinds": [- "container",- "vm"- ],- "labels": "Cancel | Back | Advanced",- "memoryText": "4 GB",- "nameInvalid": false,- "placement": "local",- "placementError": null,- "placements": [- "local"- ],- "price": null,- "primaryLabel": "Continue",- "ranges": "cpus 1-8, memory 2-16",- "resourceFacts": [- "Kind: Container",- "Disk: 3.0–7.2 GB initially; grows with use"- ],- "resourcesError": null,- "runtime": "auto",- "runtimes": [- "auto",- "gvisor",- "runc"- ],- "step": 0- },- "wizard": "set-placement"- },{"frame": {"address": {diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-stages.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-stages.jsonindex 19f4ed1cd6..6995b382fe 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-stages.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-stages.json@@ -34,7 +34,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -77,7 +76,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -120,7 +118,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading macOS (first time only)…","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -163,7 +160,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading macOS (first time only)…","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -206,7 +202,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading macOS (first time only)…","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -249,7 +244,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading macOS (first time only)…","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -292,7 +286,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Preparing the disk… 84%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -335,7 +328,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting macOS… 86%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -378,7 +370,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting macOS… 88%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -421,7 +412,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 90%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -464,7 +454,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -507,7 +496,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -529,7 +517,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -575,7 +562,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image…","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -597,7 +583,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -643,7 +628,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Preparing the disk… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -665,7 +649,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -711,7 +694,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -733,7 +715,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -779,7 +760,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -801,7 +781,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -823,7 +802,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -872,7 +850,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Creating the container… 5%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -894,7 +871,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -916,7 +892,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -965,7 +940,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting the container… 12%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -987,7 +961,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1009,7 +982,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1058,7 +1030,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 17%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1080,7 +1051,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1102,7 +1072,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1151,7 +1120,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting Cua inside the Space… 17%","Image: ghcr.io/trycua/linux:24.04-slim [copy ghcr.io/trycua/linux:24.04-slim doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1173,7 +1141,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting Linux… 53%","Image: ghcr.io/trycua/linux:24.04-slim-disk [copy ghcr.io/trycua/linux:24.04-slim-disk doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1195,7 +1162,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","Image: macos [copy macos doc.on.doc Copy / checkmark Copied 1500ms]",diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/delete-space.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/delete-space.jsonindex 27e8ea6eff..54f40c74ea 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/delete-space.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/delete-space.json@@ -22,7 +22,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Deleting…","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -42,7 +41,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -92,7 +90,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Deleting…","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -112,7 +109,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -162,7 +158,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Deleting…","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -182,7 +177,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -232,7 +226,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Deleting…","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -252,7 +245,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -302,7 +294,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -349,7 +340,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -394,7 +384,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -441,7 +430,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Deleting…","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",@@ -486,7 +474,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:keep [copy local:keep doc.on.doc Copy / checkmark Copied 1500ms]",diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.jsonindex 65e3b0579d..50048c0843 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/main-window.json@@ -16,12 +16,11 @@"sidebar": {"emptyText": null,"sections": [- "# spaces.sidebar.section.cloud",- "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.this_mac","<os-linux> aurora | spaces.status.running | This Mac","# spaces.sidebar.section.connected","<os-windows> 10.0.0.5:3211 | spaces.status.running | 10.0.0.5:3211 (selected)",+ "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.my_computers","<os-linux> research-box @ AWS · us-west-2 | spaces.status.running | AWS · us-west-2","<os-linux> their-box @ Google Cloud · us-central1 | spaces.status.suspended | Unreachable · offline (dim)"@@ -47,12 +46,11 @@"sidebar": {"emptyText": null,"sections": [- "# spaces.sidebar.section.cloud",- "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.this_mac","<os-linux> aurora | spaces.status.running | This Mac","# spaces.sidebar.section.connected","<os-windows> 10.0.0.5:3211 | spaces.status.running | 10.0.0.5:3211 (selected)",+ "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.my_computers","<os-linux> research-box @ AWS · us-west-2 | spaces.status.running | AWS · us-west-2","<os-linux> their-box @ Google Cloud · us-central1 | spaces.status.suspended | Unreachable · offline (dim)"@@ -86,12 +84,11 @@"sidebar": {"emptyText": null,"sections": [- "# spaces.sidebar.section.cloud",- "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.this_mac","<os-linux> aurora | spaces.status.running | This Mac","# spaces.sidebar.section.connected","<os-windows> 10.0.0.5:3211 | spaces.status.running | 10.0.0.5:3211 (selected)",+ "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.my_computers","<os-linux> research-box @ AWS · us-west-2 | spaces.status.running | AWS · us-west-2","<os-linux> their-box @ Google Cloud · us-central1 | spaces.status.suspended | Unreachable · offline (dim)"@@ -122,12 +119,11 @@"sidebar": {"emptyText": null,"sections": [- "# spaces.sidebar.section.cloud",- "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.this_mac","<os-linux> aurora | spaces.status.running | This Mac","# spaces.sidebar.section.connected","<os-windows> 10.0.0.5:3211 | spaces.status.running | 10.0.0.5:3211 (selected)",+ "<os-linux> builder | spaces.status.suspended | Unreachable · timed out (dim)","# spaces.sidebar.section.my_computers","<os-linux> research-box @ AWS · us-west-2 | spaces.status.running | AWS · us-west-2","<os-linux> their-box @ Google Cloud · us-central1 | spaces.status.suspended | Unreachable · offline (dim)"@@ -272,20 +268,20 @@}},{- "detail": "cloud:builder",+ "detail": "direct:builder","frame": {"actions": ["teleport: Teleport an app [arrow.down.circle] ?Teleport an app into this Space (disabled)","pip: Picture in picture [pip.enter] ?Picture in picture (disabled)","share: Share [person.badge.plus] ?Share this Space (disabled)",- "delete: Delete Space [trash] ?Delete this Space (destructive)",+ "delete: Remove [trash] ?Remove from the list (destructive)","open: Open [-] ?Open the desktop in its own window (disabled) (primary)"],"canStream": false,- "confirm": "Delete builder? | Everything inside it, including its files, is deleted and can't be recovered. | Delete Space / Keep",+ "confirm": "Remove builder? | It is only removed from the list. | Remove / Keep","facts": ["Status: Unreachable ?timed out",- "Identifier: cloud:builder [copy cloud:builder doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:builder [copy direct:builder doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],"isHost": false,diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/provisioning.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/provisioning.jsonindex 2134cc4bc1..40d1852a46 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/provisioning.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/provisioning.json@@ -19,7 +19,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -61,7 +60,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: Linux"@@ -80,7 +78,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -125,7 +122,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: Linux"@@ -144,7 +140,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -189,7 +184,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 42%","System: Linux"@@ -208,7 +202,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -253,7 +246,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: macOS",@@ -273,7 +265,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 42%","System: Linux"@@ -292,7 +283,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -340,7 +330,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Preparing the disk… 1%","System: macOS",@@ -360,7 +349,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Downloading image… 42%","System: Linux"@@ -379,7 +367,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -427,7 +414,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Preparing the disk… 1%","System: macOS",@@ -447,7 +433,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting… 80%","System: Linux"@@ -466,7 +451,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -514,7 +498,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","System: macOS",@@ -534,7 +517,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Booting… 80%","System: Linux"@@ -553,7 +535,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -601,7 +582,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","System: macOS",@@ -621,7 +601,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Connecting… 98%","System: Linux"@@ -640,7 +619,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -688,7 +666,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","System: macOS",@@ -708,7 +685,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","System: Linux"@@ -727,7 +703,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -775,7 +750,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","System: Linux"@@ -794,7 +768,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -839,7 +812,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Starting… 1%","System: Linux"@@ -858,7 +830,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","System: Linux"@@ -877,7 +848,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -896,12 +866,12 @@],"pending": true,"rows": [- "os-linux Omarchy [spaces.status.starting] 10 1%","os-linux New Space [spaces.status.starting] 1000 100%",- "os-linux demo [spaces.status.running] - -"+ "os-linux demo [spaces.status.running] - -",+ "os-linux Omarchy [spaces.status.starting] 10 1%"],"tiles": [- "os-linux Omarchy, Linux, Cua Cloud, Starting 10 Starting…",+ "os-linux Omarchy, Linux, pending:3, Starting 10 Starting…","os-linux New Space, Linux, This Mac, Starting 1000 Ready","os-linux demo, Linux, This Mac, Running - -"]@@ -925,7 +895,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Failed","System: Linux"@@ -944,7 +913,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","System: Linux"@@ -963,7 +931,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -982,12 +949,12 @@],"pending": true,"rows": [- "os-linux Omarchy [spaces.status.failed] - The Cua daemon isn't running. Start Cua, or run `cua daemon start`.","os-linux New Space [spaces.status.starting] 1000 100%",- "os-linux demo [spaces.status.running] - -"+ "os-linux demo [spaces.status.running] - -",+ "os-linux Omarchy [spaces.status.failed] - The Cua daemon isn't running. Start Cua, or run `cua daemon start`."],"tiles": [- "os-linux Omarchy, Linux, Cua Cloud, Failed - Failed",+ "os-linux Omarchy, Linux, pending:3, Failed - Failed","os-linux New Space, Linux, This Mac, Starting 1000 Ready","os-linux demo, Linux, This Mac, Running - -"]@@ -1011,243 +978,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,- "facts": [- "Status: Ready 100%",- "System: Linux"- ],- "id": "pending:1",- "previewText": "Ready",- "progress": 1000,- "progressText": null- },- {- "actions": [- "Teleport an app",- "Picture in picture",- "Share",- "Delete Space",- "Open"- ],- "canStream": true,- "creditNotice": null,- "facts": [- "Status: Running",- "Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",- "System: Linux"- ],- "id": "local:demo",- "previewText": "Loading the desktop…",- "progress": null,- "progressText": null- }- ],- "ids": [- "pending:1",- "local:demo"- ],- "pending": true,- "rows": [- "os-linux New Space [spaces.status.starting] 1000 100%",- "os-linux demo [spaces.status.running] - -"- ],- "tiles": [- "os-linux New Space, Linux, This Mac, Starting 1000 Ready",- "os-linux demo, Linux, This Mac, Running - -"- ]- }- },- {- "creates": "start pending:4",- "frame": {- "activity": {- "kind": "provisioning",- "label": "Starting 2 Spaces",- "permille": 10- },- "details": [- {- "actions": [- "Teleport an app (off)",- "Picture in picture (off)",- "Share (off)",- "Cancel",- "Open (off)"- ],- "canStream": false,- "creditNotice": null,- "facts": [- "Status: Starting… 1%",- "System: Linux"- ],- "id": "pending:4",- "previewText": "Starting…",- "progress": 10,- "progressText": null- },- {- "actions": [- "Teleport an app (off)",- "Picture in picture (off)",- "Share (off)",- "Cancel (off)",- "Open (off)"- ],- "canStream": false,- "creditNotice": null,- "facts": [- "Status: Ready 100%",- "System: Linux"- ],- "id": "pending:1",- "previewText": "Ready",- "progress": 1000,- "progressText": null- },- {- "actions": [- "Teleport an app",- "Picture in picture",- "Share",- "Delete Space",- "Open"- ],- "canStream": true,- "creditNotice": null,- "facts": [- "Status: Running",- "Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",- "System: Linux"- ],- "id": "local:demo",- "previewText": "Loading the desktop…",- "progress": null,- "progressText": null- }- ],- "ids": [- "pending:4",- "pending:1",- "local:demo"- ],- "pending": true,- "rows": [- "os-linux Cloud [spaces.status.starting] 10 1%",- "os-linux New Space [spaces.status.starting] 1000 100%",- "os-linux demo [spaces.status.running] - -"- ],- "tiles": [- "os-linux Cloud, Linux, Cua Cloud, Starting 10 Starting…",- "os-linux New Space, Linux, This Mac, Starting 1000 Ready",- "os-linux demo, Linux, This Mac, Running - -"- ]- }- },- {- "creates": "fail pending:4",- "frame": {- "activity": {- "kind": "provisioning",- "label": "Starting 1 Space",- "permille": 1000- },- "details": [- {- "actions": [- "Teleport an app (off)",- "Picture in picture (off)",- "Share (off)",- "Remove",- "Open (off)"- ],- "canStream": false,- "creditNotice": null,- "facts": [- "Status: Failed",- "System: Linux"- ],- "id": "pending:4",- "previewText": "You're out of Cua Cloud credit.",- "progress": null,- "progressText": null- },- {- "actions": [- "Teleport an app (off)",- "Picture in picture (off)",- "Share (off)",- "Cancel (off)",- "Open (off)"- ],- "canStream": false,- "creditNotice": null,- "facts": [- "Status: Ready 100%",- "System: Linux"- ],- "id": "pending:1",- "previewText": "Ready",- "progress": 1000,- "progressText": null- },- {- "actions": [- "Teleport an app",- "Picture in picture",- "Share",- "Delete Space",- "Open"- ],- "canStream": true,- "creditNotice": null,- "facts": [- "Status: Running",- "Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",- "System: Linux"- ],- "id": "local:demo",- "previewText": "Loading the desktop…",- "progress": null,- "progressText": null- }- ],- "ids": [- "pending:4",- "pending:1",- "local:demo"- ],- "pending": true,- "rows": [- "os-linux Cloud [spaces.status.failed] - You're out of Cua Cloud credit.",- "os-linux New Space [spaces.status.starting] 1000 100%",- "os-linux demo [spaces.status.running] - -"- ],- "tiles": [- "os-linux Cloud, Linux, Cua Cloud, Failed - Failed",- "os-linux New Space, Linux, This Mac, Starting 1000 Ready",- "os-linux demo, Linux, This Mac, Running - -"- ]- }- },- {- "creates": "dismiss pending:4",- "frame": {- "activity": {- "kind": "provisioning",- "label": "Starting 1 Space",- "permille": 1000- },- "details": [- {- "actions": [- "Teleport an app (off)",- "Picture in picture (off)",- "Share (off)",- "Cancel (off)",- "Open (off)"- ],- "canStream": false,- "creditNotice": null,"facts": ["Status: Ready 100%","System: Linux"@@ -1266,7 +996,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1311,7 +1040,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:fresh [copy local:fresh doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1331,7 +1059,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:demo [copy local:demo doc.on.doc Copy / checkmark Copied 1500ms]",diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/space-facts.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/space-facts.jsonindex 7dbcc81f60..40873cce85 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/space-facts.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/space-facts.json@@ -58,35 +58,35 @@"case": "no OS name at all","facts": ["Status: Unreachable ?timed out",- "Identifier: cloud:builder [copy cloud:builder doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:builder [copy direct:builder doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"]},{- "case": "cloud Space, image from the claim's template (a tag: no digest)",+ "case": "a Space whose image is a tag: no digest","facts": ["Status: Running","Image: ghcr.io/trycua/linux:24.04-disk [copy ghcr.io/trycua/linux:24.04-disk doc.on.doc Copy / checkmark Copied 1500ms]",- "Identifier: cloud:review-bot [copy cloud:review-bot doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:review-bot [copy direct:review-bot doc.on.doc Copy / checkmark Copied 1500ms]","System: Ubuntu 24.04.3 LTS","Kind: Virtual machine"]},{- "case": "cloud Space on a managed pool (a pinned image: its digest)",+ "case": "a Space on a pinned image: its digest","facts": ["Status: Running","Image: ghcr.io/example/windows@sha256:9b0e6c1d2a3f4e5d6c7b8a9f0e1d2c3b4a5f6e7d8c9b0a1f2e3d4c5b6a7f8e9d ?ghcr.io/example/windows@sha256:9b0e6c1d2a3f4e5d6c7b8a9f0e1d2c3b4a5f6e7d8c9b0a1f2e3d4c5b6a7f8e9d | sha256:9b0e6c1d2a3f4e5d6c7b8a9f0e1d2c3b4a5f6e7d8c9b0a1f2e3d4c5b6a7f8e9d [copy ghcr.io/example/windows@sha256:9b0e6c1d2a3f4e5d6c7b8a9f0e1d2c3b4a5f6e7d8c9b0a1f2e3d4c5b6a7f8e9d doc.on.doc Copy / checkmark Copied 1500ms]",- "Identifier: cloud:ci-7 [copy cloud:ci-7 doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:ci-7 [copy direct:ci-7 doc.on.doc Copy / checkmark Copied 1500ms]","System: Windows"]},{- "case": "cloud amd64 VM: no emulation warning",+ "case": "an amd64 VM: its architecture","facts": ["Status: Running","Image: ghcr.io/trycua/linux:24.04-disk [copy ghcr.io/trycua/linux:24.04-disk doc.on.doc Copy / checkmark Copied 1500ms]",- "Identifier: cloud:x64 [copy cloud:x64 doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:x64 [copy direct:x64 doc.on.doc Copy / checkmark Copied 1500ms]","System: Ubuntu 24.04.3 LTS","Kind: Virtual machine","Architecture: x64"diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/space-power.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/space-power.jsonindex 986826c326..135d847512 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/space-power.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/space-power.json@@ -19,7 +19,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -41,7 +40,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -63,7 +61,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -79,17 +76,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -99,20 +95,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.running] - - <power spaces.power.suspend>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Running - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [],@@ -136,7 +132,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Suspending…","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -158,7 +153,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -180,7 +174,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -196,17 +189,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -216,20 +208,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.suspending] - - <power spaces.status.suspending busy>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Suspending… - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -255,7 +247,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Suspending…","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -277,7 +268,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -299,7 +289,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -315,17 +304,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -335,20 +323,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.suspending] - - <power spaces.status.suspending busy>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Suspending… - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -374,7 +362,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Suspending…","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -396,7 +383,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -418,7 +404,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -434,17 +419,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -454,20 +438,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.suspending] - - <power spaces.status.suspending busy>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Suspending… - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -493,7 +477,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Suspending…","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -515,7 +498,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -537,7 +519,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -553,17 +534,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -573,20 +553,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.suspending] - - <power spaces.status.suspending busy>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Suspending… - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -612,7 +592,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -634,7 +613,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -656,7 +634,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -672,17 +649,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -692,20 +668,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - - <power spaces.power.resume on>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [],@@ -729,7 +705,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Resuming…","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -751,7 +726,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -773,7 +747,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -789,17 +762,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -809,20 +781,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.resuming] - - <power spaces.status.resuming on busy>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Resuming… - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -848,7 +820,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -871,7 +842,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -893,7 +863,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -909,17 +878,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -929,20 +897,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.running] - - <power spaces.power.turn_off>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Running - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -968,7 +936,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -991,7 +958,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Turning off…","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1013,7 +979,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1029,17 +994,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1049,20 +1013,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.turning_off] - - <power spaces.status.turning_off busy>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Turning off… - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1089,7 +1053,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1112,7 +1075,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Turning off…","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1134,7 +1096,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1150,17 +1111,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1170,20 +1130,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.turning_off] - - <power spaces.status.turning_off busy>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Turning off… - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1210,7 +1170,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1233,7 +1192,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1255,7 +1213,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1271,17 +1228,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1291,20 +1247,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.stopped] - - <power spaces.power.turn_on on>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.running] - - <power spaces.power.turn_off>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Stopped - -","os-linux studio, Linux, Mac mini, Running - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1330,7 +1286,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1353,7 +1308,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1375,7 +1329,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Turning off…","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1391,17 +1344,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1411,20 +1363,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.stopped] - - <power spaces.power.turn_on on>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.turning_off] - - <power spaces.status.turning_off busy>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Stopped - -","os-linux studio, Linux, Mac mini, Turning off… - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1451,7 +1403,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1474,7 +1425,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1496,7 +1446,6 @@"Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Turning off…","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1512,17 +1461,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1532,20 +1480,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.stopped] - - <power spaces.power.turn_on on>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.turning_off] - - <power spaces.status.turning_off busy>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Stopped - -","os-linux studio, Linux, Mac mini, Turning off… - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1572,7 +1520,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1595,7 +1542,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1617,7 +1563,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1633,17 +1578,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1653,20 +1597,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.stopped] - - <power spaces.power.turn_on on>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.stopped] - - <power spaces.power.turn_on on>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Stopped - -","os-linux studio, Linux, Mac mini, Stopped - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1692,7 +1636,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1715,7 +1658,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Turning on…","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1737,7 +1679,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1753,17 +1694,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1773,20 +1713,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.turning_on] - - <power spaces.status.turning_on on busy>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.stopped] - - <power spaces.power.turn_on on>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Turning on… - -","os-linux studio, Linux, Mac mini, Stopped - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1813,7 +1753,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1835,7 +1774,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Deleting…","Identifier: local:mac [copy local:mac doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1857,7 +1795,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1873,17 +1810,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1893,20 +1829,20 @@"local:box","local:mac","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>","os-macos mac [spaces.status.deleting] - -",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.stopped] - - <power spaces.power.turn_on on>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-macos mac, macOS, This Mac, Deleting… - Deleting…","os-linux studio, Linux, Mac mini, Stopped - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [@@ -1933,7 +1869,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Suspended in memory: it picks up where it left off when you start it.","Identifier: local:box [copy local:box doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1956,7 +1891,6 @@"Open (off)"],"canStream": false,- "creditNotice": null,"facts": ["Status: Stopped ?Shut down: its disk is kept, anything unsaved was lost.","Identifier: relay:space-0123456789abcdef [copy relay:space-0123456789abcdef doc.on.doc Copy / checkmark Copied 1500ms]",@@ -1972,17 +1906,16 @@"Teleport an app","Picture in picture","Share",- "Delete Space",+ "Remove","Open"],"canStream": true,- "creditNotice": null,"facts": ["Status: Running",- "Identifier: cloud:pool-c [copy cloud:pool-c doc.on.doc Copy / checkmark Copied 1500ms]",+ "Identifier: direct:pool-c [copy direct:pool-c doc.on.doc Copy / checkmark Copied 1500ms]","System: Linux"],- "id": "cloud:pool-c",+ "id": "direct:pool-c","previewText": "Loading the desktop…","progress": null,"progressText": null@@ -1991,18 +1924,18 @@"ids": ["local:box","relay:space-0123456789abcdef",- "cloud:pool-c"+ "direct:pool-c"],"pending": true,"rows": [- "os-linux pool-c [spaces.status.running] - -","os-linux box [spaces.status.stopped] - Could not turn it on: Docker is not running <power spaces.power.resume on>",+ "os-linux pool-c [spaces.status.running] - -","os-linux studio [spaces.status.stopped] - - <power spaces.power.turn_on on>"],"tiles": ["os-linux box, Linux, This Mac, Stopped - -","os-linux studio, Linux, Mac mini, Stopped - -",- "os-linux pool-c, Linux, Cua Cloud, Running - -"+ "os-linux pool-c, Linux, pool-c, Running - -"]},"powering": [diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/telemetry-funnel.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/telemetry-funnel.jsonindex d378bba775..b0b31050e2 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/telemetry-funnel.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/telemetry-funnel.json@@ -656,14 +656,14 @@"at": "creates","signals": [{- "feature": "space_create_cloud",+ "feature": "space_create_local","type": "feature"},{"gpu": false,"guestOs": "windows","kind": "vm",- "location": "cloud",+ "location": "direct","type": "space-create-started"},{@@ -690,7 +690,7 @@"gpu": false,"guestOs": "windows","kind": "vm",- "location": "cloud",+ "location": "direct","outcome": "error","retryAttempt": 0,"stalled": false,@@ -812,14 +812,14 @@"at": "creates","signals": [{- "feature": "space_create_cloud",+ "feature": "space_create_local","type": "feature"},{"gpu": false,"guestOs": "linux","kind": "container",- "location": "cloud",+ "location": "direct","type": "space-create-started"},{@@ -851,7 +851,7 @@"gpu": false,"guestOs": "linux","kind": "container",- "location": "cloud",+ "location": "direct","outcome": "ok","retryAttempt": 0,"stalled": false,diff --git a/libs/cua/crates/cua-spaces-app-core/parity/main-window.json b/libs/cua/crates/cua-spaces-app-core/parity/main-window.jsonindex e9e23b9f77..9fabab84d4 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/main-window.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/main-window.json@@ -16,9 +16,9 @@"error": null},{- "id": "cloud:builder",+ "id": "direct:builder","name": "builder",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": ["desktop_stream"],"addedAt": "2026-09-24T08:00:00Z",@@ -177,7 +177,6 @@{"signIn": { "kind": "idle" },"menuBar": false,- "defaultLocation": "local","telemetry": null,"agents": null},@@ -185,15 +184,12 @@"apiKeyClient": "client-123","signIn": { "kind": "failed", "message": "The code expired" },"menuBar": true,- "defaultLocation": "cloud",- "locationLockedBy": "CUA_DEFAULT_ON","telemetry": { "enabled": false, "lockedBy": "DO_NOT_TRACK" },"agents": [],"agentsBusy": false},{"signIn": { "kind": "waiting", "userCode": "WXYZ-1234" },- "defaultLocation": "local","telemetry": { "enabled": true },"agentsBusy": false,"agentsPending": ["cursor"]@@ -201,7 +197,6 @@{"identity": "[email protected]","canSignOut": true,- "defaultLocation": "local","telemetry": { "enabled": true },"agentsBusy": true}diff --git a/libs/cua/crates/cua-spaces-app-core/parity/menu-count.json b/libs/cua/crates/cua-spaces-app-core/parity/menu-count.jsonindex 52bd40dc3c..a95dd2ed0d 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/menu-count.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/menu-count.json@@ -135,9 +135,9 @@},"rows": [{- "id": "cloud:aws-ci",+ "id": "direct:aws-ci","name": "aws-ci",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": ["desktop_stream"@@ -192,9 +192,9 @@"error": null},{- "id": "cloud:aws-ci",+ "id": "direct:aws-ci","name": "aws-ci",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": ["desktop_stream"diff --git a/libs/cua/crates/cua-spaces-app-core/parity/notch.json b/libs/cua/crates/cua-spaces-app-core/parity/notch.jsonindex e15d9e4926..c55c412c61 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/notch.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/notch.json@@ -78,14 +78,14 @@}},{- "id": "cloud:builder",+ "id": "direct:builder","name": "Builder","os": "macos","status": "suspended","detail": "Unreachable","lastUsedAt": 1799990000000,"scene": "mac-desktop",- "provider": "cloud",+ "provider": "direct","sdk": {"features": [],"spacesdVersion": "0.4.0",@@ -93,7 +93,7 @@}},{- "id": "cloud:starter",+ "id": "direct:starter","name": "Starter","os": "linux","status": "provisioning",@@ -101,7 +101,7 @@"lastUsedAt": 1799980000000,"startedAt": 1799980000000,"scene": "linux-terminal",- "provider": "cloud"+ "provider": "direct"},{"id": "this-mac",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.jsonindex c0f1835383..28a78eb519 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@@ -3,7 +3,6 @@"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.","env": {"defaultLocation": "local",- "cloudAvailable": false,"localAvailable": true,"localReason": null,"localBackends": ["docker", "lume"],@@ -11,7 +10,6 @@"maxCpus": 8,"hostArch": "arm64","storage": null,- "cloudPricing": null,"experiments": { "yourCloud": false },"hosts": [{diff --git a/libs/cua/crates/cua-spaces-app-core/parity/provisioning.json b/libs/cua/crates/cua-spaces-app-core/parity/provisioning.jsonindex d43b403d03..8fd18e3ed2 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/provisioning.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/provisioning.json@@ -1,6 +1,6 @@{"name": "provisioning",- "about": "New Spaces show the instant a create starts, follow the SDK's create progress (sidebar ring and percentage, notch activity and tile, the detail), a failure stays inline until dismissed (a create the local daemon could not take says the daemon is not running, not a raw transport error; a cloud create refused for want of credit says so in one line with Add credit and the billing page), and a finished create hands over to the registry row without a gap or a duplicate.",+ "about": "New Spaces show the instant a create starts, follow the SDK's create progress (sidebar ring and percentage, notch activity and tile, the detail), a failure stays inline until dismissed (a create the local daemon could not take says the daemon is not running, not a raw transport error), and a finished create hands over to the registry row without a gap or a duplicate.","now": 1800000000000,"rows": [{@@ -25,12 +25,9 @@{ "type": "progress", "id": "pending:1", "phase": "connecting", "fraction": null },{ "type": "finish", "id": "pending:1", "spaceId": "local:fresh" },{ "type": "dismiss", "id": "pending:2" },- { "type": "start", "id": "pending:3", "name": "Omarchy", "os": "linux", "provider": "cloud", "now": 1800000003000 },+ { "type": "start", "id": "pending:3", "name": "Omarchy", "os": "linux", "provider": "direct", "now": 1800000003000 },{ "type": "fail", "id": "pending:3", "error": "transport: Connection refused (os error 61)" },- { "type": "dismiss", "id": "pending:3" },- { "type": "start", "id": "pending:4", "name": "Cloud", "os": "linux", "provider": "cloud", "now": 1800000004000 },- { "type": "fail", "id": "pending:4", "error": "You're out of Cua Cloud credit. Add credit at https://run.cua.ai/billing" },- { "type": "dismiss", "id": "pending:4" }+ { "type": "dismiss", "id": "pending:3" }],"refreshed": [{diff --git a/libs/cua/crates/cua-spaces-app-core/parity/space-facts.json b/libs/cua/crates/cua-spaces-app-core/parity/space-facts.jsonindex 1c273dc321..89d16321c3 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/space-facts.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/space-facts.json@@ -117,9 +117,9 @@{"name": "no OS name at all","row": {- "id": "cloud:builder",+ "id": "direct:builder","name": "builder",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": [],"os": "linux",@@ -129,11 +129,11 @@"usage": null},{- "name": "cloud Space, image from the claim's template (a tag: no digest)",+ "name": "a Space whose image is a tag: no digest","row": {- "id": "cloud:review-bot",+ "id": "direct:review-bot","name": "review-bot",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": ["desktop_stream"@@ -147,11 +147,11 @@"usage": null},{- "name": "cloud Space on a managed pool (a pinned image: its digest)",+ "name": "a Space on a pinned image: its digest","row": {- "id": "cloud:ci-7",+ "id": "direct:ci-7","name": "ci-7",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": ["desktop_stream"@@ -165,11 +165,11 @@"usage": null},{- "name": "cloud amd64 VM: no emulation warning",+ "name": "an amd64 VM: its architecture","row": {- "id": "cloud:x64",+ "id": "direct:x64","name": "x64",- "provider": "cloud",+ "provider": "direct","spacesdVersion": "0.4.0","features": ["desktop_stream"diff --git a/libs/cua/crates/cua-spaces-app-core/parity/space-power.json b/libs/cua/crates/cua-spaces-app-core/parity/space-power.jsonindex fbd0cf35aa..7708ff1927 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/space-power.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/space-power.json@@ -6,14 +6,14 @@{ "id": "local:box", "name": "box", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T08:00:00Z", "os": "linux", "kind": "container", "reachable": true, "power": "suspend", "powerState": "running" },{ "id": "local:mac", "name": "mac", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T07:00:00Z", "os": "macos", "kind": "vm", "reachable": true, "power": "stop", "powerState": "running" },{ "id": "relay:space-0123456789abcdef", "name": "studio", "provider": "relay", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T06:00:00Z", "os": "linux", "reachable": true, "power": "stop", "host": "mini1234", "hostName": "Mac mini" },- { "id": "cloud:pool-c", "name": "pool-c", "provider": "cloud", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }+ { "id": "direct:pool-c", "name": "pool-c", "provider": "direct", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }],"steps": [{ "step": "initial", "rows": [{ "id": "local:box", "name": "box", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T08:00:00Z", "os": "linux", "kind": "container", "reachable": true, "power": "suspend", "powerState": "running" },{ "id": "local:mac", "name": "mac", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T07:00:00Z", "os": "macos", "kind": "vm", "reachable": true, "power": "stop", "powerState": "running" },{ "id": "relay:space-0123456789abcdef", "name": "studio", "provider": "relay", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T06:00:00Z", "os": "linux", "reachable": true, "power": "stop", "host": "mini1234", "hostName": "Mac mini" },- { "id": "cloud:pool-c", "name": "pool-c", "provider": "cloud", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }+ { "id": "direct:pool-c", "name": "pool-c", "provider": "direct", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }] },{ "step": "suspend box", "action": { "type": "power-start", "id": "local:box", "on": false, "now": 1800000001000 } },{ "step": "press again while it runs", "action": { "type": "power-start", "id": "local:box", "on": false, "now": 1800000001500 } },@@ -22,13 +22,13 @@{ "id": "local:box", "name": "box", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T08:00:00Z", "os": "linux", "kind": "container", "reachable": true, "power": "suspend", "powerState": "running" },{ "id": "local:mac", "name": "mac", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T07:00:00Z", "os": "macos", "kind": "vm", "reachable": true, "power": "stop", "powerState": "running" },{ "id": "relay:space-0123456789abcdef", "name": "studio", "provider": "relay", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T06:00:00Z", "os": "linux", "reachable": true, "power": "stop", "host": "mini1234", "hostName": "Mac mini" },- { "id": "cloud:pool-c", "name": "pool-c", "provider": "cloud", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }+ { "id": "direct:pool-c", "name": "pool-c", "provider": "direct", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }] },{ "step": "refresh: box suspended", "rows": [{ "id": "local:box", "name": "box", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T08:00:00Z", "os": "linux", "kind": "container", "reachable": false, "error": "sandbox box is Paused; resume it first", "power": "suspend", "powerState": "suspended" },{ "id": "local:mac", "name": "mac", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T07:00:00Z", "os": "macos", "kind": "vm", "reachable": true, "power": "stop", "powerState": "running" },{ "id": "relay:space-0123456789abcdef", "name": "studio", "provider": "relay", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T06:00:00Z", "os": "linux", "reachable": true, "power": "stop", "host": "mini1234", "hostName": "Mac mini" },- { "id": "cloud:pool-c", "name": "pool-c", "provider": "cloud", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }+ { "id": "direct:pool-c", "name": "pool-c", "provider": "direct", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }] },{ "step": "resume box", "action": { "type": "power-start", "id": "local:box", "on": true, "now": 1800000002000 } },{ "step": "resume box fails", "action": { "type": "power-fail", "id": "local:box", "error": "Docker is not running" } },@@ -38,7 +38,7 @@{ "id": "local:box", "name": "box", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T08:00:00Z", "os": "linux", "kind": "container", "reachable": false, "error": "sandbox box is Paused; resume it first", "power": "suspend", "powerState": "suspended" },{ "id": "local:mac", "name": "mac", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T07:00:00Z", "os": "macos", "kind": "vm", "reachable": false, "error": "sandbox mac is Stopped; resume it first", "power": "stop", "powerState": "stopped" },{ "id": "relay:space-0123456789abcdef", "name": "studio", "provider": "relay", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T06:00:00Z", "os": "linux", "reachable": true, "power": "stop", "host": "mini1234", "hostName": "Mac mini" },- { "id": "cloud:pool-c", "name": "pool-c", "provider": "cloud", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }+ { "id": "direct:pool-c", "name": "pool-c", "provider": "direct", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }] },{ "step": "turn off studio on its host", "action": { "type": "power-start", "id": "relay:space-0123456789abcdef", "on": false, "now": 1800000004000 } },{ "step": "turn off studio returns", "action": { "type": "power-done", "id": "relay:space-0123456789abcdef" } },@@ -46,7 +46,7 @@{ "id": "local:box", "name": "box", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T08:00:00Z", "os": "linux", "kind": "container", "reachable": false, "error": "sandbox box is Paused; resume it first", "power": "suspend", "powerState": "suspended" },{ "id": "local:mac", "name": "mac", "provider": "local", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T07:00:00Z", "os": "macos", "kind": "vm", "reachable": false, "error": "sandbox mac is Stopped; resume it first", "power": "stop", "powerState": "stopped" },{ "id": "relay:space-0123456789abcdef", "name": "studio", "provider": "relay", "spacesdVersion": "", "features": [], "addedAt": "2027-01-15T06:00:00Z", "os": "linux", "reachable": false, "error": "timed out", "power": "stop", "host": "mini1234", "hostName": "Mac mini" },- { "id": "cloud:pool-c", "name": "pool-c", "provider": "cloud", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }+ { "id": "direct:pool-c", "name": "pool-c", "provider": "direct", "spacesdVersion": "0.4.0", "features": ["desktop_stream"], "addedAt": "2027-01-15T05:00:00Z", "os": "linux", "reachable": true }] },{ "step": "turn on mac", "action": { "type": "power-start", "id": "local:mac", "on": true, "now": 1800000005000 } },{ "step": "delete mac while it boots", "action": { "type": "delete-start", "id": "local:mac", "now": 1800000005500 } },diff --git a/libs/cua/crates/cua-spaces-app-core/parity/telemetry-funnel.json b/libs/cua/crates/cua-spaces-app-core/parity/telemetry-funnel.jsonindex 60e1656d64..2078053caa 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/telemetry-funnel.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/telemetry-funnel.json@@ -202,7 +202,7 @@"id": "pending:2","name": "","os": "windows",- "provider": "cloud",+ "provider": "direct","now": 50000,"image": null,"kind": "vm",@@ -319,7 +319,7 @@"id": "pending:5","name": "","os": "linux",- "provider": "cloud",+ "provider": "direct","now": 9000000,"image": "linux:24.04","kind": "container",@@ -347,7 +347,7 @@"action": {"type": "finish","id": "pending:5",- "spaceId": "cloud:maya-private"+ "spaceId": "direct:maya-private"}},{diff --git a/libs/cua/crates/cua-spaces-app-core/parity/teleport-review.json b/libs/cua/crates/cua-spaces-app-core/parity/teleport-review.jsonindex f420d64158..fe916a21c0 100644--- a/libs/cua/crates/cua-spaces-app-core/parity/teleport-review.json+++ b/libs/cua/crates/cua-spaces-app-core/parity/teleport-review.json@@ -50,7 +50,7 @@],"spaces": [{ "id": "local:aurora", "name": "Aurora", "os": "linux", "status": "running", "detail": "This Mac", "lastUsedAt": 1799999990000, "scene": "linux-terminal", "provider": "local", "sdk": { "features": ["desktop_stream"], "spacesdVersion": "0.4.0", "reachable": true } },- { "id": "cloud:builder", "name": "Builder", "os": "linux", "status": "suspended", "detail": "Unreachable", "lastUsedAt": 1799990000000, "scene": "linux-terminal", "provider": "cloud", "sdk": { "features": [], "spacesdVersion": "0.4.0", "reachable": false } },+ { "id": "direct:builder", "name": "Builder", "os": "linux", "status": "suspended", "detail": "Unreachable", "lastUsedAt": 1799990000000, "scene": "linux-terminal", "provider": "direct", "sdk": { "features": [], "spacesdVersion": "0.4.0", "reachable": false } },{ "id": "this-mac", "name": "This machine", "os": "macos", "status": "local", "detail": "Set up for access", "lastUsedAt": 1800000000000, "scene": "mac-desktop" }],"notch": [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.jsonindex c117762cec..cb6b70e21c 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@@ -3,7 +3,6 @@"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.","env": {"defaultLocation": "local",- "cloudAvailable": false,"localAvailable": true,"localReason": null,"localBackends": ["docker"],@@ -11,7 +10,6 @@"maxCpus": 8,"hostArch": "arm64","storage": null,- "cloudPricing": null,"clouds": [],"experiments": { "yourCloud": true }},diff --git a/libs/cua/crates/cua-spaces-app-core/src/billing.rs b/libs/cua/crates/cua-spaces-app-core/src/billing.rsdeleted file mode 100644index 0619845bb7..0000000000--- a/libs/cua/crates/cua-spaces-app-core/src/billing.rs+++ /dev/null@@ -1,192 +0,0 @@-// SPDX-License-Identifier: FSL-1.1-MIT-// Copyright (c) 2026 Cua AI, Inc.--//! Cua Cloud billing as both apps show it. The apps have no payment-//! onboarding: the website does it (sign-up credit, adding a card). The-//! apps only show the account's credit in Settings (with "Manage billing",-//! the website's billing page) and, when a new cloud Space is refused-//! because the account is out of credit, one plain line with "Add credit".-//! Local Spaces never depend on any of it.--use serde::{Deserialize, Serialize};--/// The apps show Cua Cloud billing: Settings' Billing row and a refused-/// cloud Space's "Add credit". Off while the apps do not offer Cua Cloud-/// ([`crate::model::CLOUD_SPACES_OFFERED`]); the SDK's billing calls stay.-pub const BILLING_SHOWN: bool = crate::model::CLOUD_SPACES_OFFERED;--/// The account app's billing page: billing and account links point at the-/// account app, and only while [`BILLING_SHOWN`] is on (off by default).-pub const BILLING_URL: &str = "https://app.cua.ai/billing";--/// The saved card (never its number).-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]-#[serde(rename_all = "camelCase")]-pub struct BillingCard {- /// `visa`, `mastercard`, ...- pub brand: String,- /// Last four digits.- pub last4: String,-}--/// The account's Cua Cloud credit.-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]-#[serde(rename_all = "camelCase")]-pub struct BillingCredit {- /// What is left, US cents.- pub balance_usd_cents: i64,-}--/// The account's billing, as the apps read it.-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]-#[serde(rename_all = "camelCase")]-pub struct BillingStatus {- /// Billing is on for this account (off: Settings shows no Billing row).- pub billing_enabled: bool,- /// The saved default card.- #[serde(default)]- pub card: Option<BillingCard>,- /// The account's credit, when it has any.- #[serde(default)]- pub credit: Option<BillingCredit>,- /// The website billing page (credit, cards, plans).- #[serde(default)]- pub billing_url: Option<String>,-}--/// The line a refused cloud Space shows.-pub const OUT_OF_CREDIT: &str = "You're out of Cua Cloud credit.";--/// Its button.-pub const ADD_CREDIT: &str = "Add credit";--/// "Manage billing" (Settings).-pub const MANAGE_BILLING: &str = "Manage billing";--/// A cloud Space refused for want of credit: the line, the button, and the-/// website billing page it opens.-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]-pub struct CreditNotice {- /// [`OUT_OF_CREDIT`].- pub text: String,- /// [`ADD_CREDIT`].- pub button: String,- /// The website billing page.- pub url: String,-}--/// The out-of-credit notice for an error message, when that is what `raw`-/// is ("You're out of Cua Cloud credit. Add credit at <url>"), with or-/// without a prefix.-pub fn credit_notice(raw: &str) -> Option<CreditNotice> {- let lower = raw.to_ascii_lowercase();- if !lower.contains("out of cua cloud credit") {- return None;- }- let marker = "add credit at ";- let at = lower.find(marker)? + marker.len();- let url = raw[at..]- .split_whitespace()- .next()?- .trim_end_matches(['.', ')', ',', '"', '\'']);- // Whatever page the error names, the button opens the account app.- (url.starts_with("https://") || url.starts_with("http://")).then(|| CreditNotice {- text: OUT_OF_CREDIT.into(),- button: ADD_CREDIT.into(),- url: BILLING_URL.into(),- })-}--/// `$10`, `$7.42`, `-$0.30`.-pub fn dollars(cents: i64) -> String {- let sign = if cents < 0 { "-" } else { "" };- let c = cents.unsigned_abs();- if c.is_multiple_of(100) {- format!("{sign}${}", c / 100)- } else {- format!("{sign}${}.{:02}", c / 100, c % 100)- }-}--/// `Visa ending 4242`.-pub fn card_text(card: &BillingCard) -> String {- let brand = match card.brand.to_ascii_lowercase().as_str() {- "amex" | "american_express" => "American Express".to_string(),- "mastercard" => "Mastercard".to_string(),- "" | "unknown" => "Card".to_string(),- b => {- let mut c = b.chars();- c.next()- .map(|f| f.to_uppercase().collect::<String>() + c.as_str())- .unwrap_or_default()- }- };- format!("{brand} ending {}", card.last4)-}--/// Settings' Billing line: `$7.42 credit left`, else the card, else-/// `No card`.-pub fn billing_line(status: &BillingStatus) -> String {- match (&status.credit, &status.card) {- (Some(c), _) => format!("{} credit left", dollars(c.balance_usd_cents.max(0))),- (None, Some(card)) => card_text(card),- (None, None) => "No card".into(),- }-}--#[cfg(test)]-mod tests {- use super::*;-- #[test]- fn words() {- assert_eq!(dollars(1000), "$10");- assert_eq!(dollars(742), "$7.42");- assert_eq!(dollars(-30), "-$0.30");- let visa = BillingCard {- brand: "visa".into(),- last4: "4242".into(),- };- assert_eq!(card_text(&visa), "Visa ending 4242");- let mut s = BillingStatus {- billing_enabled: true,- card: None,- credit: Some(BillingCredit {- balance_usd_cents: 742,- }),- billing_url: Some(BILLING_URL.into()),- };- assert_eq!(billing_line(&s), "$7.42 credit left");- s.credit = None;- assert_eq!(billing_line(&s), "No card");- s.card = Some(visa);- assert_eq!(billing_line(&s), "Visa ending 4242");- }-- #[test]- fn out_of_credit_errors_become_one_line_and_a_button() {- for raw in [- "You're out of Cua Cloud credit. Add credit at https://app.cua.ai/billing",- "cloud_credit_exhausted: You're out of Cua Cloud credit. Add credit at https://app.cua.ai/billing.",- "CloudCreditExhausted(\"You're out of Cua Cloud credit. Add credit at https://app.cua.ai/billing\")",- ] {- assert_eq!(- credit_notice(raw),- Some(CreditNotice {- text: OUT_OF_CREDIT.into(),- button: ADD_CREDIT.into(),- url: BILLING_URL.into(),- }),- "{raw}"- );- }- for raw in [- "admission denied: sandbox size is over the limits",- "You're out of Cua Cloud credit.",- "out of Cua Cloud credit. Add credit at javascript:alert(1)",- "no local runtime",- ] {- assert_eq!(credit_notice(raw), None, "{raw}");- }- }-}diff --git a/libs/cua/crates/cua-spaces-app-core/src/diagnostics.rs b/libs/cua/crates/cua-spaces-app-core/src/diagnostics.rsindex 72941c289d..263781a8ce 100644--- a/libs/cua/crates/cua-spaces-app-core/src/diagnostics.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/diagnostics.rs@@ -94,7 +94,6 @@ fn word(s: &str) -> &str {"windows" => "Windows","macos" => "macOS","local" => "this computer",- "cloud" => "Cua Cloud","relay" => "another of my computers","container" => "container","vm" => "VM",@@ -129,7 +128,7 @@ pub fn create_report(input: &CreateReportInput) -> CreateReport {&crate::errors::plain_error(&input.error),&input.phase,"",- input.provider != "cloud",+ true,);let error_kind = if kind.is_empty() { "other" } else { kind }.to_string();let r = |s: &str| redact_with(s, &input.names);diff --git a/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs b/libs/cua/crates/cua-spaces-app-core/src/dispatch.rsindex 0bae996d04..c781f96490 100644--- a/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/dispatch.rs@@ -32,11 +32,9 @@ pub const METHODS: &[&str] = &["spaces.nameOf","spaces.providerOfId","spaces.normalizeProvider",- "spaces.cloudNamespaceOf","spaces.sceneForOs","spaces.hasFeature","spaces.sharesDesktop",- "spaces.isSpacesPool","spaces.sortByMru","spaces.touchSpace","spaces.countActive",@@ -367,7 +365,6 @@ pub fn call_value(method: &str, args: Value) -> Result<Value, CoreError> {)),"spaces.providerOfId" => out(spaces::provider_of_id(&a.get::<String>("id")?)),"spaces.normalizeProvider" => out(spaces::normalize_provider(&a.get::<String>("word")?)),- "spaces.cloudNamespaceOf" => out(spaces::cloud_namespace_of(&a.get::<String>("id")?)),"spaces.sceneForOs" => out(spaces::scene_for_os(a.get("os")?)),"spaces.hasFeature" => out(spaces::has_feature(&a.get("space")?,@@ -377,7 +374,6 @@ pub fn call_value(method: &str, args: Value) -> Result<Value, CoreError> {// or not one of your machines): when it does not, nothing asks its// desktop or its processes."spaces.sharesDesktop" => out(sidebar::shares_desktop(&a.get("space")?)),- "spaces.isSpacesPool" => out(spaces::is_spaces_pool(&a.get("space")?)),"spaces.sortByMru" => out(spaces::sort_by_mru(&a.get::<Vec<Space>>("spaces")?)),"spaces.touchSpace" => out(spaces::touch_space(&a.get::<Vec<Space>>("spaces")?,diff --git a/libs/cua/crates/cua-spaces-app-core/src/host.rs b/libs/cua/crates/cua-spaces-app-core/src/host.rsindex 7e8547bbc5..82a97c78aa 100644--- a/libs/cua/crates/cua-spaces-app-core/src/host.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/host.rs@@ -131,7 +131,6 @@ pub fn this_machine_space(status: Option<&HostSummaryInput>, now: i64, os: Spacelast_used_at: now,started_at: None,scene: scene_for_os(os),- fleet_id: None,size: None,region: None,provider: None,diff --git a/libs/cua/crates/cua-spaces-app-core/src/lib.rs b/libs/cua/crates/cua-spaces-app-core/src/lib.rsindex 28db9a3728..64f38fbc60 100644--- a/libs/cua/crates/cua-spaces-app-core/src/lib.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/lib.rs@@ -57,7 +57,6 @@pub mod about;pub mod agent_keys;pub mod agents;-pub mod billing;pub mod checklist;pub mod cloud_connect;pub mod devices;diff --git a/libs/cua/crates/cua-spaces-app-core/src/local_network.rs b/libs/cua/crates/cua-spaces-app-core/src/local_network.rsindex 69e3714eb2..e06414c6c4 100644--- a/libs/cua/crates/cua-spaces-app-core/src/local_network.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/local_network.rs@@ -192,7 +192,6 @@ mod tests {assert!(!applies(SpaceProvider::Local, SpaceOs::Macos, false));assert!(!applies(SpaceProvider::Local, SpaceOs::Linux, true));assert!(!applies(SpaceProvider::Relay, SpaceOs::Macos, true));- assert!(!applies(SpaceProvider::Cloud, SpaceOs::Macos, true));}#[test]@@ -254,7 +253,6 @@ mod tests {Some("preparing"),false,&then.error_variant,- Some(SpaceProvider::Local)),"local_network_denied");diff --git a/libs/cua/crates/cua-spaces-app-core/src/machines.rs b/libs/cua/crates/cua-spaces-app-core/src/machines.rsindex bba51213a8..d3bff6661e 100644--- a/libs/cua/crates/cua-spaces-app-core/src/machines.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/machines.rs@@ -961,7 +961,6 @@ mod tests {}).collect(),default_location: Location::Local,- cloud_available: false,local_available: true,local_reason: None,local_backends: Some(vec!["docker".into()]),@@ -971,7 +970,6 @@ mod tests {lume_source: None,linux_source: None,storage: None,- cloud_pricing: None,clouds: vec![],experiments: crate::experiments::Experiments::default(),gpus: None,diff --git a/libs/cua/crates/cua-spaces-app-core/src/model.rs b/libs/cua/crates/cua-spaces-app-core/src/model.rsindex 5bfac00f6c..7661121bf7 100644--- a/libs/cua/crates/cua-spaces-app-core/src/model.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/model.rs@@ -149,8 +149,6 @@ pub enum ThumbnailScene {#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]#[serde(rename_all = "lowercase")]pub enum SpaceProvider {- /// Cua Cloud.- Cloud,/// This Mac.Local,/// A machine added by address.@@ -163,7 +161,6 @@ impl SpaceProvider {/// The JSON word.pub fn as_str(self) -> &'static str {match self {- SpaceProvider::Cloud => "cloud",SpaceProvider::Local => "local",SpaceProvider::Direct => "direct",SpaceProvider::Relay => "relay",@@ -173,7 +170,6 @@ impl SpaceProvider {/// A known location word.pub fn parse(word: &str) -> Option<Self> {match word {- "cloud" => Some(SpaceProvider::Cloud),"local" => Some(SpaceProvider::Local),"direct" => Some(SpaceProvider::Direct),"relay" => Some(SpaceProvider::Relay),@@ -218,9 +214,6 @@ pub struct Space {pub started_at: Option<i64>,/// Placeholder scene.pub scene: ThumbnailScene,- /// Group (cloud namespace or location word).- #[serde(default, skip_serializing_if = "Option::is_none")]- pub fleet_id: Option<String>,/// Fixture machine size.#[serde(default, skip_serializing_if = "Option::is_none")]pub size: Option<String>,@@ -339,10 +332,6 @@ pub struct SpaceProgress {/// Why the create failed.#[serde(default, skip_serializing_if = "Option::is_none")]pub error: Option<String>,- /// It failed because the account is out of Cua Cloud credit: the- /// website billing page "Add credit" opens.- #[serde(default, skip_serializing_if = "Option::is_none")]- pub credit_url: Option<String>,/// While it downloads: "4.2 of 22.1 GB · 85 MB/s · about 4 min"/// ([`crate::spaces::creating::transfer_text`]).#[serde(default, skip_serializing_if = "Option::is_none")]@@ -557,19 +546,10 @@ pub fn emulation_warning_on(})}-/// The apps offer Cua Cloud for new Spaces. Off: the apps create Spaces on-/// this Mac and on machines added by address, and the New Space wizard-/// shows "Your cloud" as coming soon. The cua SDK and CLI still create-/// cloud sandboxes, and cloud Spaces that already exist still list.-pub const CLOUD_SPACES_OFFERED: bool = false;-/// Where new Spaces can be created.#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]#[serde(rename_all = "lowercase")]pub enum Location {- /// Cua Cloud (the SDK's `on="cloud"`). The apps do not offer it for new- /// Spaces ([`CLOUD_SPACES_OFFERED`]); existing cloud Spaces still list.- Cloud,/// This Mac.Local,/// The user's own cloud account (AWS, Google Cloud, Hetzner, Modal), connected@@ -588,7 +568,7 @@ pub enum Location {}impl Location {- /// "Cua Cloud" / "This Mac" / "Your cloud" / "Your machine" / "Auto".+ /// "This Mac" / "Your cloud" / "Your computer" / "Auto".pub fn label(self) -> &'static str {self.label_on(SpaceOs::Macos)}@@ -597,7 +577,6 @@ impl Location {/// "This computer" on Linux.pub fn label_on(self, os: SpaceOs) -> &'static str {match self {- Location::Cloud => "Cua Cloud",Location::Local => os.this_machine(),Location::Yours => "Your cloud",Location::Host => "Your computer",@@ -605,20 +584,10 @@ impl Location {}}- /// Where an image goes when it cannot run here: this Mac, else Cua- /// Cloud.- pub fn other(self) -> Self {- match self {- Location::Cloud | Location::Yours | Location::Host | Location::Auto => Location::Local,- Location::Local => Location::Cloud,- }- }-/// The SDK's `on` word (`yours` and `host` are not ones: the/// provider's word and `host:<machine>` are).pub fn as_str(self) -> &'static str {match self {- Location::Cloud => "cloud",Location::Local => "local",Location::Yours => "yours",Location::Host => "host",@@ -671,8 +640,6 @@ pub enum Runtime {Qemu,/// Lume.Lume,- /// KubeVirt.- Kubevirt,/// An external runtime provider installed on this machine, by its name/// (the `<name>` of its `cua-runtime-<name>` executable).Other(String),@@ -699,7 +666,6 @@ impl Runtime {Runtime::Runc => "runc".into(),Runtime::Qemu => "QEMU".into(),Runtime::Lume => "Lume".into(),- Runtime::Kubevirt => "KubeVirt".into(),Runtime::Other(n) => crate::wizard::external_runtime_label(n),}}@@ -712,7 +678,6 @@ impl Runtime {Runtime::Runc => "runc",Runtime::Qemu => "qemu",Runtime::Lume => "lume",- Runtime::Kubevirt => "kubevirt",Runtime::Other(n) => n,}}@@ -726,7 +691,6 @@ impl Runtime {"runc" => Runtime::Runc,"qemu" => Runtime::Qemu,"lume" => Runtime::Lume,- "kubevirt" => Runtime::Kubevirt,w if valid_runtime_word(w) => Runtime::Other(w.to_string()),_ => return None,})@@ -759,7 +723,6 @@ mod runtime_tests {("runc", Runtime::Runc),("qemu", Runtime::Qemu),("lume", Runtime::Lume),- ("kubevirt", Runtime::Kubevirt),("acme", Runtime::Other("acme".into())),("acme-2", Runtime::Other("acme-2".into())),] {diff --git a/libs/cua/crates/cua-spaces-app-core/src/notch/geometry.rs b/libs/cua/crates/cua-spaces-app-core/src/notch/geometry.rsindex e3e4f4440e..8e5525b8fc 100644--- a/libs/cua/crates/cua-spaces-app-core/src/notch/geometry.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/notch/geometry.rs@@ -18,7 +18,7 @@ pub enum WindowMode {/// has room to hang below the notch. Same top-centre placement as `Ambient`.AmbientTeleport,Switcher,- CreateFleet,+ CreateSpace,}#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]@@ -106,11 +106,11 @@ pub fn mode_size(mode: WindowMode, style: DisplayStyle) -> Size {width: 760.0,height: 300.0,},- (WindowMode::CreateFleet, DisplayStyle::Notched) => Size {+ (WindowMode::CreateSpace, DisplayStyle::Notched) => Size {width: 600.0,height: 700.0,},- (WindowMode::CreateFleet, DisplayStyle::NoNotch) => Size {+ (WindowMode::CreateSpace, DisplayStyle::NoNotch) => Size {width: 600.0,height: 680.0,},@@ -210,7 +210,7 @@ mod tests {for style in [DisplayStyle::Notched, DisplayStyle::NoNotch] {let a = mode_size(WindowMode::Ambient, style);let s = mode_size(WindowMode::Switcher, style);- let c = mode_size(WindowMode::CreateFleet, style);+ let c = mode_size(WindowMode::CreateSpace, style);assert!(a.height < s.height && s.height < c.height, "{style:?}");assert!(a.width < s.width, "{style:?}");}@@ -220,7 +220,7 @@ mod tests {assert!(mode_size(WindowMode::Ambient, DisplayStyle::NoNotch).width < 200.0);// The composer must leave room for its actions on a 768pt external display.assert_eq!(- mode_size(WindowMode::CreateFleet, DisplayStyle::NoNotch).height,+ mode_size(WindowMode::CreateSpace, DisplayStyle::NoNotch).height,680.0);}@@ -366,8 +366,8 @@ mod tests {#[test]fn serde_uses_kebab_case_for_modes() {assert_eq!(- serde_json::to_string(&WindowMode::CreateFleet).unwrap(),- "\"create-fleet\""+ serde_json::to_string(&WindowMode::CreateSpace).unwrap(),+ "\"create-space\"");assert_eq!(serde_json::from_str::<WindowMode>("\"switcher\"").unwrap(),diff --git a/libs/cua/crates/cua-spaces-app-core/src/notch/mod.rs b/libs/cua/crates/cua-spaces-app-core/src/notch/mod.rsindex eab92f932d..63c1eb6e0c 100644--- a/libs/cua/crates/cua-spaces-app-core/src/notch/mod.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/notch/mod.rs@@ -423,9 +423,8 @@ pub fn location(space: &Space, spaces: &[Space]) -> String {if space.id == THIS_MACHINE_ID {return "This Mac".into();}- match space.provider.unwrap_or(SpaceProvider::Cloud) {+ match space.provider.unwrap_or(SpaceProvider::Direct) {SpaceProvider::Local => "This Mac".into(),- SpaceProvider::Cloud => crate::spaces::sidebar::location_text(space).into(),SpaceProvider::Direct => text(&space.host_name).unwrap_or_else(|| {space.id@@ -471,7 +470,6 @@ pub fn matches(space: &Space, query: &str) -> bool {space.status.label(),&format!("{:?}", space.status),space.detail.as_str(),- space.fleet_id.as_deref().unwrap_or_default(),crate::spaces::sidebar::location_text(space),space.host_name.as_deref().unwrap_or_default(),]@@ -1346,6 +1344,7 @@ mod tests {s.id = id.into();s.name = name.into();s.status = status;+ s.provider = Some(crate::model::SpaceProvider::Local);s}@@ -1403,7 +1402,7 @@ mod tests {assert_eq!(by("b").symbol, "os-windows");assert_eq!(by("c").symbol, "os-macos");assert_eq!(by("d").symbol, "os-linux", "no distro reported: Tux");- assert_eq!(by("b").label, "Lab PC, Windows, Cua Cloud, Suspended");+ assert_eq!(by("b").label, "Lab PC, Windows, This Mac, Suspended");assert!(by("b").targeted && by("b").dim);}@@ -1674,7 +1673,6 @@ mod tests {permille: 300,label: "Failed".into(),error: Some("pull failed".into()),- credit_url: None,transfer: None,cancellable: false,cancelling: false,@@ -2045,7 +2043,7 @@ mod tests {(t.progress, t.progress_label.as_deref()),(None, Some("Deleting\u{2026}")));- assert_eq!(t.label, "Gone, Linux, Cua Cloud, Deleting\u{2026}");+ assert_eq!(t.label, "Gone, Linux, This Mac, Deleting\u{2026}");}#[test]diff --git a/libs/cua/crates/cua-spaces-app-core/src/onboarding_preview.rs b/libs/cua/crates/cua-spaces-app-core/src/onboarding_preview.rsindex 40d49f7bd7..4e39335bf8 100644--- a/libs/cua/crates/cua-spaces-app-core/src/onboarding_preview.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/onboarding_preview.rs@@ -218,7 +218,6 @@ fn sample_space(name: &str, os: SpaceOs, os_name: &str, scene: ThumbnailScene) -last_used_at: 0,started_at: None,scene,- fleet_id: None,size: None,region: None,provider: Some(SpaceProvider::Local),diff --git a/libs/cua/crates/cua-spaces-app-core/src/parity.rs b/libs/cua/crates/cua-spaces-app-core/src/parity.rsindex 2bc4f024fa..3f67dbe903 100644--- a/libs/cua/crates/cua-spaces-app-core/src/parity.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/parity.rs@@ -2271,11 +2271,6 @@ fn provisioning_frame("progressText": d["progressText"],"canStream": d["canStream"],"actions": actions,- // `text [button -> url]`, when a cloud create ran out of credit.- "creditNotice": if d["creditNotice"].is_null() { Value::Null } else {- Value::String(format!("{} [{} -> {}]", d["creditNotice"]["text"].as_str().unwrap_or(""),- d["creditNotice"]["button"].as_str().unwrap_or(""), d["creditNotice"]["url"].as_str().unwrap_or("")))- },});// Why turning it off or on failed, when it did.if let Some(e) = d["powerError"].as_str() {@@ -4296,7 +4291,7 @@ fn run_launch_at_login(f: &Value, h: &dyn Host) -> Result<Value, String> {h,"settings.page",json!({ "input": { "signIn": { "kind": "idle" }, "canSignOut": false, "menuBar": false,- "defaultLocation": "local", "agentsBusy": false, "agentsPending": [],+ "agentsBusy": false, "agentsPending": [],"loginItem": step["loginItem"] } }),)?;let general: Vec<Value> = v["sections"]diff --git a/libs/cua/crates/cua-spaces-app-core/src/settings.rs b/libs/cua/crates/cua-spaces-app-core/src/settings.rsindex ff818cd0e2..5009f491b1 100644--- a/libs/cua/crates/cua-spaces-app-core/src/settings.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/settings.rs@@ -30,6 +30,11 @@ pub enum SwitcherTheme {Glass,}+fn location_or_local<'de, D: serde::Deserializer<'de>>(d: D) -> Result<Location, D::Error> {+ let word = String::deserialize(d)?;+ Ok(serde_json::from_value(serde_json::Value::String(word)).unwrap_or(Location::Local))+}+/// Settings.#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]#[serde(rename_all = "camelCase", default)]@@ -40,7 +45,10 @@ pub struct AppSettings {pub menu_bar: bool,/// Switcher theme.pub theme: SwitcherTheme,- /// Where New Space starts.+ /// Where New Space starts. A word this build does not know (the+ /// retired `cloud`) reads as this Mac, so an old file keeps its other+ /// settings.+ #[serde(deserialize_with = "location_or_local")]pub default_location: Location,/// Hide the notch over full-screen apps.pub hide_in_full_screen: bool,@@ -371,7 +379,7 @@ pub struct TelemetryInput {pub struct SettingsInput {/// The signed-in account.pub identity: Option<String>,- /// Cua Cloud through client credentials (an API key): its client id.+ /// The Cua account through client credentials (an API key): its client id.pub api_key_client: Option<String>,/// The sign-in in progress.pub sign_in: SignInPhase,@@ -380,10 +388,6 @@ pub struct SettingsInput {/// The Spaces tab is hidden from the notch (the menu bar item is the/// entry point).pub menu_bar: bool,- /// Where New Space starts.- pub default_location: Location,- /// The environment sets the default location: which variable.- pub location_locked_by: Option<String>,/// The telemetry switch (none until read).pub telemetry: Option<TelemetryInput>,/// Coding agents (none while detecting).@@ -397,8 +401,6 @@ pub struct SettingsInput {/// app's links only.#[serde(default)]pub teams: Option<crate::teams::TeamsInput>,- /// The account's Cua Cloud billing, once read (signed in).- pub billing: Option<crate::billing::BillingStatus>,/// Launch at login, once the system was asked (none: no rows).pub login_item: Option<crate::login_item::LoginItemInput>,/// Settings, Experiments (what the page mentions follows them).@@ -442,14 +444,11 @@ impl Default for SettingsInput {sign_in: SignInPhase::Idle,can_sign_out: false,menu_bar: false,- default_location: Location::Local,- location_locked_by: None,telemetry: None,agents: None,agents_busy: false,agents_pending: vec![],teams: None,- billing: None,login_item: None,experiments: Experiments::default(),keyvault_auto_wipe: None,@@ -729,21 +728,6 @@ pub fn page(input: &SettingsInput) -> SettingsPage {r.button = Some("Sign out".into());}account.push(r);- // Billing: the credit left, and the website's billing page (the- // apps take no payment details). Row id `billing`; the button- // opens `link_url`. Not shown while the apps do not offer Cua Cloud.- if let Some(b) = input- .billing- .as_ref()- .filter(|b| b.billing_enabled && crate::billing::BILLING_SHOWN)- {- let mut r = row("billing", Text, "Billing");- r.value = Some(crate::billing::billing_line(b));- r.button = Some(crate::billing::MANAGE_BILLING.into());- r.link_url = Some(crate::billing::BILLING_URL.into());- r.enabled = true;- account.push(r);- }} else if let SignInPhase::Waiting { user_code, .. } = &input.sign_in {let mut r = row("sign-in-code",@@ -796,27 +780,6 @@ pub fn page(input: &SettingsInput) -> SettingsPage {if let Some(on) = input.overflow {general.push(overflow_row(on));}- // Where New Space starts: only a choice while the apps offer Cua Cloud.- if crate::model::CLOUD_SPACES_OFFERED {- let mut location = row("default-location", Choice, "New Spaces run on");- location.options = vec![- opt(- "local",- Location::Local.label(),- input.default_location == Location::Local,- ),- opt(- "cloud",- Location::Cloud.label(),- input.default_location == Location::Cloud,- ),- ];- if let Some(var) = input.location_locked_by.clone().filter(|v| !v.is_empty()) {- location.enabled = false;- location.help = Some(format!("Set by {var}"));- }- general.push(location);- }let mut welcome = row("welcome", Text, "Welcome");welcome.button = Some("Show again".into());general.push(welcome);@@ -1112,7 +1075,7 @@ mod tests {let path = dir.join("settings.json");let s = AppSettings {menu_bar: true,- default_location: Location::Cloud,+ default_location: Location::Yours,last_seen_version: Some("0.2.0 (0.2.0.1)".into()),update_channel: UpdateChannel::Beta,launch_at_login: Some(false),@@ -1127,6 +1090,11 @@ mod tests {assert_eq!(old.last_seen_version, None);assert_eq!(old.update_channel, UpdateChannel::Stable);assert_eq!(old.launch_at_login, None, "never chosen");+ // The retired `cloud` default reads as this Mac; the rest is kept.+ std::fs::write(&path, r#"{"menuBar":true,"defaultLocation":"cloud"}"#).unwrap();+ let retired = load(&path);+ assert!(retired.menu_bar);+ assert_eq!(retired.default_location, Location::Local);std::fs::write(&path, "{nope").unwrap();assert_eq!(load(&path), AppSettings::default());let _ = std::fs::remove_dir_all(dir);diff --git a/libs/cua/crates/cua-spaces-app-core/src/sign_in.rs b/libs/cua/crates/cua-spaces-app-core/src/sign_in.rsindex 12987d9d5c..58bf1cee2f 100644--- a/libs/cua/crates/cua-spaces-app-core/src/sign_in.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/sign_in.rs@@ -202,7 +202,7 @@ pub enum SignInFooterState {pub struct SignInFooterInput {/// The signed-in account.pub identity: Option<String>,- /// Cua Cloud works through client credentials (an API key).+ /// The Cua account works through client credentials (an API key).pub cloud_configured: bool,/// Signing in is possible here.pub can_sign_in: bool,diff --git a/libs/cua/crates/cua-spaces-app-core/src/spaces/creating.rs b/libs/cua/crates/cua-spaces-app-core/src/spaces/creating.rsindex f3b0c90be2..06ed55a18e 100644--- a/libs/cua/crates/cua-spaces-app-core/src/spaces/creating.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/spaces/creating.rs@@ -53,9 +53,6 @@ pub struct PendingCreate {pub permille: u32,/// Why it failed.pub error: Option<String>,- /// It failed for want of Cua Cloud credit: the billing page.- #[serde(default)]- pub credit_url: Option<String>,/// The registered Space's id once it finished; the row goes when the/// registry lists it.pub space_id: Option<String>,@@ -407,8 +404,6 @@ pub enum CreateFamily {Macos,/// A Windows VM (QEMU; emulated on Apple silicon).Windows,- /// A cloud Space.- Cloud,}/// What a create usually takes, in seconds per phase of [`PHASES`]: the@@ -422,7 +417,7 @@ pub enum CreateFamily {/// - emulated VM, `omarchy:edge` (amd64 under QEMU TCG): 63 s pulling,/// 112 to 119 s waiting for cua-spacesd.///-/// macOS, Windows and cloud are estimates (not measured). A phase a family+/// macOS and Windows are estimates (not measured). A phase a family/// does not report is 0.pub fn expected_seconds(family: CreateFamily) -> [f64; 6] {match family {@@ -432,7 +427,6 @@ pub fn expected_seconds(family: CreateFamily) -> [f64; 6] {CreateFamily::EmulatedVm => [1.4, 63.0, 0.0, 0.2, 115.0, 0.5],CreateFamily::Macos => [2.0, 600.0, 10.0, 30.0, 60.0, 3.0],CreateFamily::Windows => [2.0, 300.0, 0.0, 1.0, 300.0, 1.0],- CreateFamily::Cloud => [2.0, 0.0, 3.0, 20.0, 0.0, 5.0],}}@@ -440,7 +434,6 @@ pub fn expected_seconds(family: CreateFamily) -> [f64; 6] {pub fn family(p: &PendingCreate) -> CreateFamily {match (p.provider, p.os) {(_, SpaceOs::Unknown) => CreateFamily::Unknown,- (SpaceProvider::Cloud, _) => CreateFamily::Cloud,(_, SpaceOs::Macos) => CreateFamily::Macos,(_, SpaceOs::Windows) => CreateFamily::Windows,(_, SpaceOs::Linux) => match (p.kind, p.emulated) {@@ -670,9 +663,8 @@ pub fn phase_label(phase: &str) -> &'static str {/// macOS…", then "Starting Cua inside the Space…"; a Linux or Windows VM/// the same with its OS, a container "Creating the container…" and/// "Starting the container…". A step it has no words of its own for-/// (preparing, connecting, a cloud claim) reads as [`phase_label`].+/// (preparing, connecting) reads as [`phase_label`].pub fn stage_label(p: &PendingCreate) -> String {- let here = p.provider != SpaceProvider::Cloud;let vm = matches!(p.os, SpaceOs::Macos | SpaceOs::Windows) || p.kind == Some(SpaceKind::Vm);let container = !vm && p.kind == Some(SpaceKind::Container);let os = match p.os {@@ -684,10 +676,10 @@ pub fn stage_label(p: &PendingCreate) -> String {match p.phase.as_str() {// Lume keeps the base image: later macOS Spaces clone it."pulling" if p.os == SpaceOs::Macos => "Downloading macOS (first time only)\u{2026}".into(),- "creating" if here && vm => "Preparing the disk\u{2026}".into(),- "creating" if here && container => "Creating the container\u{2026}".into(),- "booting" if here && vm && !os.is_empty() => format!("Booting {os}\u{2026}"),- "booting" if here && container => "Starting the container\u{2026}".into(),+ "creating" if vm => "Preparing the disk\u{2026}".into(),+ "creating" if container => "Creating the container\u{2026}".into(),+ "booting" if vm && !os.is_empty() => format!("Booting {os}\u{2026}"),+ "booting" if container => "Starting the container\u{2026}".into(),"waiting_for_services" => "Starting Cua inside the Space\u{2026}".into(),other => phase_label(other).into(),}@@ -985,15 +977,8 @@ pub fn failure_cause(raw: &str, phase: Option<&str>, gpu: bool) -> Option<Failur/// the SDK's text names (`image_pull_not_found`, `vm_boot_timeout`,/// `services_unreachable`, ...; [`cua_create_failure::create_failure_kind`]),/// else what the shell sent (`Runtime`, as most are), else `other`. Only-/// the word leaves the process, never the text. `provider` is where it ran:-/// a cloud create's "X is not available" is not this machine's runtime.-pub fn failure_variant<'a>(- raw: &str,- phase: Option<&str>,- gpu: bool,- shell: &'a str,- provider: Option<SpaceProvider>,-) -> &'a str {+/// the word leaves the process, never the text.+pub fn failure_variant<'a>(raw: &str, phase: Option<&str>, gpu: bool, shell: &'a str) -> &'a str {if failure_cause(raw, phase, gpu) == Some(FailureCause::Gpu) {return FailureCause::Gpu.variant();}@@ -1001,7 +986,7 @@ pub fn failure_variant<'a>(&crate::errors::plain_error(raw),phase.unwrap_or(""),shell,- provider != Some(SpaceProvider::Cloud),+ true,)}@@ -1015,7 +1000,7 @@ pub struct FailDecision {/// The finer cause.pub subclass: Subclass,/// [`Retry::Once`] only for a first attempt that failed for a reason- /// that usually passes; never while cancelling, for a credit refusal, or+ /// that usually passes; never while cancelling, or/// on the second attempt.pub retry: Retry,}@@ -1024,25 +1009,15 @@ pub struct FailDecision {/// enum case `error_variant`). One function for the reducer and for/// telemetry, so the event a failure sends matches what the row does.pub fn fail_decision(p: &PendingCreate, error: &str, error_variant: &str) -> FailDecision {- let kind = retry::snake(failure_variant(- error,- Some(&p.phase),- p.gpu,- error_variant,- Some(p.provider),- ));+ let kind = retry::snake(failure_variant(error, Some(&p.phase), p.gpu, error_variant));let plain = crate::errors::plain_error(error);let subclass = retry::subclass(&kind, &plain);- let retry = if p.attempt == 0- && !p.cancelling- && p.space_id.is_none()- && !error.trim().is_empty()- && crate::billing::credit_notice(error).is_none()- {- retry::decide(&kind, subclass)- } else {- Retry::Never- };+ let retry =+ if p.attempt == 0 && !p.cancelling && p.space_id.is_none() && !error.trim().is_empty() {+ retry::decide(&kind, subclass)+ } else {+ Retry::Never+ };FailDecision {kind,subclass,@@ -1297,13 +1272,9 @@ pub fn failure_text_on(/// The platform a create will run ([`crate::model::run_arch`] over the/// catalog's platforms for the image).-fn running_arch(- image: Option<&str>,- provider: SpaceProvider,- host: Option<&str>,-) -> Option<String> {+fn running_arch(image: Option<&str>, host: Option<&str>) -> Option<String> {let platforms = image.map(crate::wizard::image_arch).unwrap_or_default();- crate::model::run_arch(&platforms, provider != SpaceProvider::Cloud, host)+ crate::model::run_arch(&platforms, true, host)}/// Advances the pending creates.@@ -1331,7 +1302,7 @@ pub fn reduce(state: &CreatesState, action: &CreateAction) -> CreatesState {.or_else(|| image.as_deref().and_then(crate::wizard::image_kind)).or((*os != SpaceOs::Linux).then_some(SpaceKind::Vm));let host = host_arch.as_deref();- let arch = running_arch(image.as_deref(), *provider, host);+ let arch = running_arch(image.as_deref(), host);let mut p = PendingCreate {id: id.clone(),name: pending_name(name, *os),@@ -1343,14 +1314,8 @@ pub fn reduce(state: &CreatesState, action: &CreateAction) -> CreatesState {pulled: false,permille: 0,error: None,- credit_url: None,space_id: None,- emulated: crate::model::emulation_warning(- *provider != SpaceProvider::Cloud,- host,- arch.as_deref(),- )- .is_some(),+ emulated: crate::model::emulation_warning(true, host, arch.as_deref()).is_some(),image,kind,arch,@@ -1518,7 +1483,6 @@ pub fn reduce(state: &CreatesState, action: &CreateAction) -> CreatesState {p.retry_pending = true;p.retried_subclass = Some(decision.subclass.as_str().into());p.error = None;- p.credit_url = None;p.fix = None;p.phase = "preparing".into();p.fraction = None;@@ -1530,28 +1494,18 @@ pub fn reduce(state: &CreatesState, action: &CreateAction) -> CreatesState {p.permille = permille_at(p, *now);return next;}- // Out of credit: one plain line, and the billing page (the- // page only while the apps show billing).- let credit = crate::billing::credit_notice(error);- // The same failure again: its fix, not a plain Try again- // (out of credit has its own way out).- p.fix = (repeats >= 2 && credit.is_none())- .then(|| fix_for(&decision.kind, p))- .flatten();- p.credit_url = credit- .as_ref()- .filter(|_| crate::billing::BILLING_SHOWN)- .map(|n| n.url.clone());- p.error = Some(match credit {- Some(n) => n.text,- None if error.trim().is_empty() => "Could not create the Space".into(),- None => failure_text_on(+ // The same failure again: its fix, not a plain Try again.+ p.fix = (repeats >= 2).then(|| fix_for(&decision.kind, p)).flatten();+ p.error = Some(if error.trim().is_empty() {+ "Could not create the Space".into()+ } else {+ failure_text_on(error,Some(&p.phase),Some(p.provider),p.host_name.as_deref(),p.gpu,- ),+ )});}}@@ -1762,7 +1716,6 @@ fn setting_up_runtime(p: &PendingCreate) -> bool {pub fn pending_space(p: &PendingCreate) -> Space {let failed = p.error.is_some();let where_ = match p.provider {- SpaceProvider::Cloud => "Cua Cloud",SpaceProvider::Local => "This Mac",// Created on another of your machines: not this Mac.SpaceProvider::Relay | SpaceProvider::Direct => "Another computer",@@ -1804,7 +1757,6 @@ pub fn pending_space(p: &PendingCreate) -> Space {last_used_at: p.started_at,started_at: Some(p.started_at),scene: scene_for_os(p.os),- fleet_id: None,size: None,region: None,provider: Some(p.provider),@@ -1815,7 +1767,6 @@ pub fn pending_space(p: &PendingCreate) -> Space {permille: p.permille,label,error: p.error.clone(),- credit_url: p.credit_url.clone(),transfer: (!failed && !p.cancelling && (p.phase == "pulling" || setting_up_runtime(p))).then(|| {transfer_text_with(@@ -1976,7 +1927,7 @@ mod tests {let raw = "Install Docker Desktop to run Linux computers.";assert_eq!(failure_text(raw, Some("preparing"), None, false), raw);assert_eq!(- failure_variant(raw, Some("preparing"), false, "Runtime", None),+ failure_variant(raw, Some("preparing"), false, "Runtime"),"runtime_missing");}@@ -2381,18 +2332,6 @@ mod tests {"Connecting...",]));- // A cloud claim: no disk or boot of its own to name.- assert_eq!(- stages(SpaceOs::Linux, Some(SpaceKind::Vm), SpaceProvider::Cloud),- want([- "Starting...",- "Downloading image...",- "Creating...",- "Booting...",- "Starting Cua inside the Space...",- "Connecting...",- ])- );// The download: bytes, rate and time left under the bar, on the// row of a create on another machine too.@@ -2723,7 +2662,7 @@ mod tests {#[test]fn bands_cover_the_bar_in_order_for_every_family() {use CreateFamily::*;- for f in [Container, Vm, EmulatedVm, Macos, Windows, Cloud] {+ for f in [Container, Vm, EmulatedVm, Macos, Windows] {for pulled in [true, false] {let b = bands(f, pulled);assert_eq!(b[0].0, 10, "{f:?}");@@ -2898,7 +2837,6 @@ mod tests {CreateFamily::EmulatedVm,CreateFamily::Macos,CreateFamily::Windows,- CreateFamily::Cloud,] {for (i, phase) in PHASES.iter().enumerate() {let l = stall_limit_secs(fam, i);@@ -3105,62 +3043,6 @@ mod tests {assert_eq!(old, CreatesState::default());}- #[test]- fn out_of_credit_is_one_line_and_add_credit_only_while_billing_shows() {- let s = reduce(- &CreatesState::default(),- &start("pending:1", "demo", SpaceOs::Linux),- );- let s = reduce(- &s,- &CreateAction::Fail {- id: "pending:1".into(),- error: "You're out of Cua Cloud credit. Add credit at https://run.cua.ai/billing"- .into(),- error_variant: String::new(),- now: None,- },- );- let space = pending_space(&s.pending[0]);- assert_eq!(space.detail, crate::billing::OUT_OF_CREDIT);- let notice = crate::spaces::sidebar::detail(&space).credit_notice;- if crate::billing::BILLING_SHOWN {- let n = notice.expect("notice");- assert_eq!(- (n.text.as_str(), n.button.as_str(), n.url.as_str()),- (- crate::billing::OUT_OF_CREDIT,- "Add credit",- crate::billing::BILLING_URL- )- );- } else {- assert_eq!(notice, None, "no Add credit while the apps hide billing");- }- // Any other failure has no notice.- let s = reduce(- &s,- &CreateAction::Dismiss {- id: "pending:1".into(),- },- );- let s = reduce(&s, &start("pending:2", "b", SpaceOs::Linux));- let s = reduce(- &s,- &CreateAction::Fail {- id: "pending:2".into(),- error: "no local runtime".into(),- error_variant: String::new(),- now: None,- },- );- assert!(- crate::spaces::sidebar::detail(&pending_space(&s.pending[0]))- .credit_notice- .is_none()- );- }-#[test]fn a_stopped_download_says_how_far_it_got() {let s = reduce(@@ -3283,7 +3165,7 @@ mod tests {Try again; it picks up where it stopped.");assert_eq!(- failure_variant(stopped, Some("pulling"), false, "Runtime", None),+ failure_variant(stopped, Some("pulling"), false, "Runtime"),"image_pull");// QEMU missing on a Windows PC: 0.9.2's after the pull, and the@@ -3300,7 +3182,7 @@ mod tests {"{raw}");assert_eq!(- failure_variant(raw, Some("pulling"), false, "Other", None),+ failure_variant(raw, Some("pulling"), false, "Other"),"runtime_missing");}diff --git a/libs/cua/crates/cua-spaces-app-core/src/spaces/mod.rs b/libs/cua/crates/cua-spaces-app-core/src/spaces/mod.rsindex d7c26bf881..f85ad14acd 100644--- a/libs/cua/crates/cua-spaces-app-core/src/spaces/mod.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/spaces/mod.rs@@ -6,7 +6,7 @@//! and detail ([`sidebar`]) with its Stream section ([`stream`]) and the//! cover over its live desktop ([`cover`]).//!-//! Every location (Cua Cloud, this Mac, added by address, relay) arrives+//! Every location (this Mac, added by address, relay) arrives//! through one `list_spaces` roster; the SDK owns lifecycle and the spacesd//! handshake, this module only turns its rows into what the shells draw.@@ -71,13 +71,6 @@ pub fn normalize_provider(word: &str) -> SpaceProvider {SpaceProvider::parse(word).unwrap_or(SpaceProvider::Direct)}-/// The cloud namespace of a legacy `space://cloud/<ns>/<name>` id.-pub fn cloud_namespace_of(id: &str) -> Option<String> {- let rest = id.strip_prefix("space://cloud/")?;- let end = rest.find('/')?;- (end > 0).then(|| rest[..end].to_string())-}-/// The placeholder scene for an OS.pub fn scene_for_os(os: SpaceOs) -> ThumbnailScene {match os {@@ -129,7 +122,6 @@ pub fn name_of(id: &str, name: &str) -> String {fn provider_label(p: SpaceProvider) -> &'static str {match p {- SpaceProvider::Cloud => "Cua Cloud",SpaceProvider::Local => "This Mac",SpaceProvider::Direct => "Direct",SpaceProvider::Relay => "My computers",@@ -153,8 +145,6 @@ fn detail_for(row: &SpaceRow, status: SpaceStatus) -> String {};}match normalize_provider(&row.provider) {- SpaceProvider::Cloud => cloud_namespace_of(&row.id)- .unwrap_or_else(|| provider_label(SpaceProvider::Cloud).into()),SpaceProvider::Direct => row.id.strip_prefix("space://direct/")@@ -210,7 +200,6 @@ pub fn row_to_space(row: &SpaceRow, now: i64) -> Space {};let added = row.added_at.as_deref().and_then(parse_rfc3339_ms);let provider = normalize_provider(&row.provider);- let namespace = cloud_namespace_of(&row.id);let text = |v: &Option<String>| v.clone().filter(|v| !v.trim().is_empty());let (os_name, os_pretty_name, image) = ((os != SpaceOs::Unknown)@@ -238,7 +227,6 @@ pub fn row_to_space(row: &SpaceRow, now: i64) -> Space {last_used_at: added.unwrap_or(now),started_at: added,scene: scene_for_os(os),- fleet_id: Some(namespace.unwrap_or_else(|| provider.as_str().to_string())),size: None,region: None,provider: Some(provider),@@ -348,20 +336,12 @@ pub fn rows_to_spaces(rows: &[SpaceRow], now: i64) -> Vec<Space> {rows.iter().map(|r| row_to_space(r, now)).collect()}-/// A Space on the Cua Spaces pool (the account's `cua-spaces*` namespace or-/// the shared `spaces-linux` pool): listed first.-pub fn is_spaces_pool(space: &Space) -> bool {- cloud_namespace_of(&space.id)- .is_some_and(|ns| ns.starts_with("cua-spaces") || ns == "spaces-linux")-}--/// Pool Spaces first, then most recently used, then by name.+/// Most recently used first, then by name.pub fn sort_by_mru(spaces: &[Space]) -> Vec<Space> {let mut out = spaces.to_vec();out.sort_by(|a, b| {- let (pa, pb) = (is_spaces_pool(a), is_spaces_pool(b));- pb.cmp(&pa)- .then_with(|| b.last_used_at.cmp(&a.last_used_at))+ b.last_used_at+ .cmp(&a.last_used_at).then_with(|| collate(&a.name, &b.name))});out@@ -606,9 +586,9 @@ mod tests {fn row() -> SpaceRow {SpaceRow {- id: "space://cloud/cua-spaces-abc/brave-otter".into(),+ id: "space://direct/10.0.0.5:3211".into(),name: "brave-otter".into(),- provider: "cloud".into(),+ provider: "direct".into(),spacesd_version: "0.4.0".into(),features: vec!["desktop_stream".into(), "window_stream".into()],added_at: Some("2026-08-30T12:00:00Z".into()),@@ -694,12 +674,11 @@ mod tests {}#[test]- fn maps_a_reachable_cloud_row() {+ fn maps_a_reachable_row() {let s = row_to_space(&row(), 1_000);assert_eq!(s.name, "brave-otter");assert_eq!(s.status, SpaceStatus::Running);- assert_eq!(s.fleet_id.as_deref(), Some("cua-spaces-abc"));- assert_eq!(s.detail, "cua-spaces-abc");+ assert_eq!(s.detail, "10.0.0.5:3211");assert_eq!(s.last_used_at, 1_788_091_200_000);assert!(has_feature(&s, feature::DESKTOP_STREAM));}@@ -735,7 +714,6 @@ mod tests {assert_eq!(d.detail, "10.0.0.5:3211");assert_eq!(d.name, "10.0.0.5:3211");assert_eq!(d.last_used_at, 42);- assert_eq!(d.fleet_id.as_deref(), Some("direct"));let hex = row_to_space(&SpaceRow {id: "local:demo-box".into(),@@ -751,7 +729,7 @@ mod tests {#[test]fn ids_name_their_provider() {- assert_eq!(provider_of_id("cloud:x"), Some(SpaceProvider::Cloud));+ assert_eq!(provider_of_id("cloud:x"), None, "Cua Cloud has ended");assert_eq!(provider_of_id("space://relay/abc"),Some(SpaceProvider::Relay)@@ -761,7 +739,7 @@ mod tests {}#[test]- fn mru_puts_pool_first_then_recent() {+ fn mru_puts_the_most_recent_first() {let mk = |id: &str, t: i64| Space {id: id.into(),name: id.into(),@@ -771,7 +749,6 @@ mod tests {last_used_at: t,started_at: None,scene: ThumbnailScene::LinuxTerminal,- fleet_id: None,size: None,region: None,provider: None,@@ -790,13 +767,9 @@ mod tests {cloud_place: None,cloud_delete: None,};- let sorted = sort_by_mru(&[- mk("a", 10),- mk("space://cloud/cua-spaces-x/p", 1),- mk("b", 20),- ]);+ let sorted = sort_by_mru(&[mk("a", 10), mk("c", 1), mk("b", 20)]);let ids: Vec<_> = sorted.iter().map(|s| s.id.as_str()).collect();- assert_eq!(ids, ["space://cloud/cua-spaces-x/p", "b", "a"]);+ assert_eq!(ids, ["b", "a", "c"]);}/// The menu bar's count and the notch tab leave out the machines thatdiff --git a/libs/cua/crates/cua-spaces-app-core/src/spaces/roster.rs b/libs/cua/crates/cua-spaces-app-core/src/spaces/roster.rsindex a2da5da147..dc48b6ff49 100644--- a/libs/cua/crates/cua-spaces-app-core/src/spaces/roster.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/spaces/roster.rs@@ -134,9 +134,9 @@ pub fn reduce(state: &RosterState, action: &RosterAction) -> RosterState {next.mode = WindowMode::Ambient;}}- RosterAction::OpenCreate => next.mode = WindowMode::CreateFleet,+ RosterAction::OpenCreate => next.mode = WindowMode::CreateSpace,RosterAction::CancelCreate => {- if state.mode == WindowMode::CreateFleet {+ if state.mode == WindowMode::CreateSpace {next.mode = WindowMode::Switcher;}}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.rsindex a657cb047b..59de78bd21 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@@ -12,21 +12,18 @@ use crate::model::{};use serde::{Deserialize, Serialize};-/// Section title codes, in order: "Cua Cloud", "This Mac", "Connected",-/// "My computers".-pub const SECTION_ORDER: [&str; 4] = [- "spaces.sidebar.section.cloud",+/// Section title codes, in order: "This Mac", "Connected", "My computers".+pub const SECTION_ORDER: [&str; 3] = ["spaces.sidebar.section.this_mac","spaces.sidebar.section.connected","spaces.sidebar.section.my_computers",];fn section_of(p: Option<SpaceProvider>) -> &'static str {- match p.unwrap_or(SpaceProvider::Cloud) {- SpaceProvider::Cloud => SECTION_ORDER[0],- SpaceProvider::Local => SECTION_ORDER[1],- SpaceProvider::Direct => SECTION_ORDER[2],- SpaceProvider::Relay => SECTION_ORDER[3],+ match p.unwrap_or(SpaceProvider::Direct) {+ SpaceProvider::Local => SECTION_ORDER[0],+ SpaceProvider::Direct => SECTION_ORDER[1],+ SpaceProvider::Relay => SECTION_ORDER[2],}}@@ -181,8 +178,7 @@ pub fn location_text(space: &Space) -> &'static str {if space.id == THIS_MACHINE_ID {return "This Mac";}- match space.provider.unwrap_or(SpaceProvider::Cloud) {- SpaceProvider::Cloud => "Cua Cloud",+ match space.provider.unwrap_or(SpaceProvider::Direct) {SpaceProvider::Local => "This Mac",SpaceProvider::Direct => "By address",SpaceProvider::Relay => "Relay",@@ -253,7 +249,7 @@ pub struct SidebarRow {/// A titled group of rows.#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]pub struct SidebarSection {- /// "Cua Cloud", "This Mac", "Connected", "My computers"+ /// "This Mac", "Connected", "My computers"/// (`spaces.sidebar.section.*`).pub title: Msg,/// Rows.@@ -501,10 +497,6 @@ pub struct SpaceDetail {pub confirm: DeleteConfirm,/// The sections under the facts, in order (Stream, Agents, Teleport).pub sections: Vec<String>,- /// A cloud Space refused for want of credit: one line and "Add- /// credit" (the website billing page).- #[serde(default)]- pub credit_notice: Option<crate::billing::CreditNotice>,/// Why turning it off or on failed, shown inline under the preview.#[serde(default)]pub power_error: Option<String>,@@ -1135,15 +1127,6 @@ pub fn detail_live(progress_text: creating.filter(|p| p.error.is_none()).and_then(|p| p.transfer.clone()),- credit_notice: creating.and_then(|p| {- p.credit_url- .clone()- .map(|url| crate::billing::CreditNotice {- text: crate::billing::OUT_OF_CREDIT.into(),- button: crate::billing::ADD_CREDIT.into(),- url,- })- }),delete_label: delete_label.into(),remove_only,power_error: power_error(space),@@ -1793,15 +1776,6 @@ mod tests {assert_eq!(fact_of(&d, "Kind").unwrap().value, "Container");let arch = fact_of(&d, "Architecture").unwrap();assert_eq!((arch.value.as_str(), arch.warning.as_ref()), ("ARM", None));- // A cloud Space never warns; without the host's arch nothing does.- let cloud =- super::super::row_to_space(&local_row("cloud:c", None, Some("vm"), Some("amd64")), 0);- assert!(- fact_of(&detail_live(&cloud, None, Some("arm64")), "Architecture")- .unwrap()- .warning- .is_none()- );assert!(fact_of(&detail_live(&omarchy, None, None), "Architecture").unwrap()@@ -2103,7 +2077,6 @@ mod tests {permille: 500,label: "Starting".into(),error: None,- credit_url: None,transfer: None,cancellable: true,cancelling: false,@@ -2123,7 +2096,6 @@ mod tests {permille: 580,label: "Downloading image\u{2026}".into(),error: None,- credit_url: None,transfer: transfer.map(str::to_string),cancellable: true,cancelling: false,diff --git a/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs b/libs/cua/crates/cua-spaces-app-core/src/telemetry.rsindex 7eb7d1b31d..a48d284418 100644--- a/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/telemetry.rs@@ -564,15 +564,11 @@ pub fn creates(before: &CreatesState, action: &CreateAction, now_ms: i64) -> Vecgpu: p.gpu,}});- [feature(if provider.as_str() == "cloud" {- "space_create_cloud"- } else {- "space_create_local"- })]- .into_iter()- .chain(started)- .chain([step("first_space_created", true)])- .collect()+ [feature("space_create_local")]+ .into_iter()+ .chain(started)+ .chain([step("first_space_created", true)])+ .collect()}CreateAction::Finish { id, .. } => match find(id) {Some(p) if p.space_id.is_none() => vec![@@ -614,7 +610,6 @@ pub fn creates(before: &CreatesState, action: &CreateAction, now_ms: i64) -> VecSome(&p.phase),p.gpu,error_variant,- Some(p.provider),);vec![create_event(p,diff --git a/libs/cua/crates/cua-spaces-app-core/src/window.rs b/libs/cua/crates/cua-spaces-app-core/src/window.rsindex 981ccfcab7..ac820d2afa 100644--- a/libs/cua/crates/cua-spaces-app-core/src/window.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/window.rs@@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize};pub struct ChromeInput {/// The signed-in account.pub identity: Option<String>,- /// Cua Cloud works (signed in, or client credentials).+ /// The Cua account works (signed in, or client credentials).pub cloud_configured: bool,/// Signing in is possible here (the native shell).pub can_sign_in: bool,diff --git a/libs/cua/crates/cua-spaces-app-core/src/wizard.rs b/libs/cua/crates/cua-spaces-app-core/src/wizard.rsindex 0d9995a210..67d205802d 100644--- a/libs/cua/crates/cua-spaces-app-core/src/wizard.rs+++ b/libs/cua/crates/cua-spaces-app-core/src/wizard.rs@@ -303,33 +303,6 @@ fn external_runtime_detail(name: &str) -> Option<String> {.filter(|d| !d.is_empty())}-/// The image list's cloud engine.-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]-#[serde(rename_all = "lowercase")]-pub enum CloudEngine {- /// gVisor containers.- Gvisor,- /// KubeVirt VMs.- Kubevirt,-}--impl CloudEngine {- /// Tile description.- pub fn label(self) -> &'static str {- match self {- CloudEngine::Gvisor => "gVisor container in Cua Cloud",- CloudEngine::Kubevirt => "Virtual machine in Cua Cloud",- }- }-- fn runtime(self) -> Runtime {- match self {- CloudEngine::Gvisor => Runtime::Gvisor,- CloudEngine::Kubevirt => Runtime::Kubevirt,- }- }-}-/// The catalog's image tier (canonical images only).#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]#[serde(rename_all = "lowercase")]@@ -364,8 +337,6 @@ pub struct SandboxImage {pub spacesd: bool,/// Local engine.pub local: Option<LocalEngine>,- /// Cloud engine.- pub cloud: Option<CloudEngine>,/// `slim`, `full` or `xcode` (canonical images only).#[serde(default, skip_serializing_if = "Option::is_none")]pub tier: Option<ImageTier>,@@ -524,7 +495,6 @@ fn with_external(base: &Catalog, runtimes: &[ExternalRuntimeInfo]) -> Catalog {summary: r.description.clone().unwrap_or_else(|| r.label.clone()),spacesd: true,local: Some(LocalEngine::External(r.name.clone())),- cloud: None,tier: None,published: true,distro: None,@@ -785,7 +755,6 @@ pub fn can_place(image: &SandboxImage, on: Location) -> bool {return on == Location::Local;}match on {- Location::Cloud => crate::model::CLOUD_SPACES_OFFERED && image.cloud.is_some(),Location::Local => image.local.is_some(),// Whether the connected cloud runs it is its own answer// ([`cloud_offer`]); every image is a candidate. A machine of@@ -1122,7 +1091,6 @@ pub fn selected_host<'a>(state: &WizardState, env: &'a WizardEnv) -> Option<&'a/// automatically).pub fn runtime_options(image: &SandboxImage, on: Location) -> Vec<Runtime> {match on {- Location::Cloud => image.cloud.map(|c| vec![c.runtime()]).unwrap_or_default(),Location::Local => match &image.local {Some(LocalEngine::External(n)) => vec![Runtime::Other(n.clone())],Some(LocalEngine::Container) => vec![Runtime::Auto, Runtime::Gvisor, Runtime::Runc],@@ -1408,46 +1376,19 @@ fn default_memory_gb(image: &SandboxImage) -> u32 {pub const STEPS: [&str; 4] = ["System", "Resources", "Options", "Summary"];/// Memory slider bounds, GB (local).pub const MEMORY_GB_RANGE: (u32, u32) = (2, 16);-/// vCPU slider bounds for Cua Cloud: the everyday range.-pub const CLOUD_CPU_RANGE: (u32, u32) = (1, 8);-/// Memory slider bounds for Cua Cloud, GB: the everyday range (1-32 GB);-/// desktops start at 2.-pub const CLOUD_MEMORY_GB_RANGE: (u32, u32) = (2, 32);--/// Cua Cloud rates for this account.-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]-#[serde(rename_all = "camelCase")]-pub struct CloudPricing {- /// USD per reserved vCPU per hour.- pub vcpu_hour_usd: f64,- /// USD per reserved GB (GiB) of memory per hour.- pub memory_gib_hour_usd: f64,-}--/// `About $0.18/hour` for `cpus` vCPUs and `memory_gb` GB at `pricing`,-/// or `None` without usable rates (never a guess).-pub fn price_text(pricing: Option<&CloudPricing>, cpus: u32, memory_gb: u32) -> Option<String> {- let p = pricing.filter(|p| {- p.vcpu_hour_usd.is_finite()- && p.memory_gib_hour_usd.is_finite()- && p.vcpu_hour_usd > 0.0- && p.memory_gib_hour_usd > 0.0- })?;- let usd = f64::from(cpus) * p.vcpu_hour_usd + f64::from(memory_gb) * p.memory_gib_hour_usd;- Some(if usd < 0.005 {- "Under $0.01/hour".to_string()- } else {- format!("About ${usd:.2}/hour")- })-}-+/// vCPU slider bounds on a machine of yours or in your cloud: the everyday+/// range.+pub const REMOTE_CPU_RANGE: (u32, u32) = (1, 8);+/// Memory slider bounds there, GB: the everyday range (1-32 GB); desktops+/// start at 2.+pub const REMOTE_MEMORY_GB_RANGE: (u32, u32) = (2, 32);/// The sliders' bounds where the Space runs: `(cpus, memory GB)`.fn size_ranges(placement: Location, env: &WizardEnv) -> ((u32, u32), (u32, u32)) {match placement {// A machine of yours: the everyday range (its own size is not known// here; it refuses what it cannot run).- Location::Cloud | Location::Yours | Location::Host | Location::Auto => {- (CLOUD_CPU_RANGE, CLOUD_MEMORY_GB_RANGE)+ Location::Yours | Location::Host | Location::Auto => {+ (REMOTE_CPU_RANGE, REMOTE_MEMORY_GB_RANGE)}Location::Local => ((1, env.max_cpus.max(1)), MEMORY_GB_RANGE),}@@ -1465,8 +1406,6 @@ fn effective_size(state: &WizardState, env: &WizardEnv) -> (u32, u32) {pub struct WizardEnv {/// Where "Run on" starts (Settings, `cua config set default.on`).pub default_location: Location,- /// Signed in (or client credentials).- pub cloud_available: bool,/// A local container backend or Lume exists.pub local_available: bool,/// Why local is unavailable.@@ -1497,9 +1436,6 @@ pub struct WizardEnv {/// when known.#[serde(default)]pub storage: Option<LocalStorage>,- /// This account's Cua Cloud rates, when known (no estimate without).- #[serde(default)]- pub cloud_pricing: Option<CloudPricing>,/// The user's connected clouds (`cloud_status`), for "Your cloud"/// (offered only while its experiment is on: [`offered_clouds`]).#[serde(default)]@@ -1877,13 +1813,11 @@ pub enum WizardAction {},}-/// `location`, or this Mac when the apps do not offer it-/// ([`crate::model::CLOUD_SPACES_OFFERED`]), no cloud of the user's is-/// offered ([`offered_clouds`]), or it names no machine (a default is-/// never one of your machines).+/// `location`, or this Mac when no cloud of the user's is offered+/// ([`offered_clouds`]) or it names no machine (a default is never one of+/// your machines).fn offered_location(location: Location, env: &WizardEnv) -> Location {match location {- Location::Cloud if !crate::model::CLOUD_SPACES_OFFERED => Location::Local,Location::Yours if offered_clouds(env).is_empty() => Location::Local,Location::Host | Location::Auto => Location::Local,l => l,@@ -2023,12 +1957,9 @@ fn rebase(state: &mut WizardState, image_ref: &str) {state.memory_gb = default_memory_gb(&next);state.disk_gb = None;// Follow the image to where it can run (the choice when possible).- if !can_place(&next, state.placement) {- let other = state.placement.other();- if can_place(&next, other) {- state.placement = other;- state.picked = true;- }+ if !can_place(&next, state.placement) && can_place(&next, Location::Local) {+ state.placement = Location::Local;+ state.picked = true;}}@@ -2129,8 +2060,6 @@ pub fn reduce(state: &WizardState, action: &WizardAction, env: &WizardEnv) -> Wis.placement = Location::Local;} else if on == "auto" {s.placement = Location::Auto;- } else if on == "cloud" {- s.placement = Location::Cloud;} else {s.placement = Location::Yours;s.cloud = Some(on.clone());@@ -2356,10 +2285,10 @@ pub struct CreatePlan {/// Name, when given.#[serde(default, skip_serializing_if = "Option::is_none")]pub name: Option<String>,- /// vCPUs (local and Cua Cloud).+ /// vCPUs (local and remote).#[serde(default, skip_serializing_if = "Option::is_none")]pub cpus: Option<u32>,- /// Memory MB (local and Cua Cloud).+ /// Memory MB (local and remote).#[serde(default, skip_serializing_if = "Option::is_none")]pub memory_mb: Option<u32>,/// Local VMs only: grow the disk to this many GB (larger than the@@ -2462,7 +2391,6 @@ pub fn create_args(plan: &CreatePlan) -> CreateSpaceArgs {/// container's by its runtime), or the cloud's.fn gpu_runtime(image: &SandboxImage, placement: Location, runtime: &Runtime) -> &'static str {match placement {- Location::Cloud => "cloud",// Your cloud's machine types carry no GPU option (yet): no row.Location::Yours => "yours",// Nor do your other machines (their runtimes are not this Mac's),@@ -3281,8 +3209,7 @@ pub const AUTO_PLACEMENT_DETAIL: &str =/// The "Run on" menu: Auto (while you have a machine that provides/// Spaces), This Mac, each machine of yours that provides Spaces (disabled/// with why while offline, not sharing or at its limit), then each-/// connected cloud while the "Your cloud" experiment is on (Cua Cloud-/// first, while the apps offer it).+/// connected cloud while the "Your cloud" experiment is on.pub fn placement_options(state: &WizardState, env: &WizardEnv) -> Vec<PlacementOption> {placement_options_on(state, env, SpaceOs::Macos)}@@ -3337,23 +3264,6 @@ pub fn placement_options_on(.unwrap_or_else(|| via_text(h).into()),});}- if crate::model::CLOUD_SPACES_OFFERED {- out.push(PlacementOption {- id: "cloud".into(),- label: Location::Cloud.label().into(),- group: "clouds".into(),- selected: placement == Location::Cloud,- enabled: can_place(&image, Location::Cloud),- detail: if !env.cloud_available {- "Sign in to Cua to create cloud Spaces.".to_string()- } else {- image- .cloud- .map(|c| c.label().to_string())- .unwrap_or_else(|| "Not available for this image yet.".into())- },- });- }let chosen = selected_cloud(state, env).map(|c| c.name.as_str());for c in offered_clouds(env) {out.push(PlacementOption {@@ -3430,7 +3340,6 @@ pub fn view_on(state: &WizardState, env: &WizardEnv, os: SpaceOs) -> WizardView}).filter(|h| !h.is_empty());let placement_ready = match placement {- Location::Cloud => env.cloud_available,Location::Local => local_ready,Location::Yours => offer.is_some(),Location::Host => host.is_some() && host_why.is_none(),@@ -3503,7 +3412,6 @@ pub fn view_on(state: &WizardState, env: &WizardEnv, os: SpaceOs) -> WizardView.map(|o| o.id.clone()).unwrap_or_else(|| "local".into());let placement_error = (!placement_ready && placeable).then(|| match placement {- Location::Cloud => "Sign in to use Cua Cloud.".to_string(),Location::Yours => match cloud {Some(c) => cloud_refusal(&image, c).unwrap_or_else(|| format!("{} does not run this image.", c.title)),@@ -3579,10 +3487,6 @@ pub fn view_on(state: &WizardState, env: &WizardEnv, os: SpaceOs) -> WizardView}).collect();let engine_text = match placement {- Location::Cloud => image- .cloud- .map(|c| c.label().to_string())- .unwrap_or_else(|| "Not available in Cua Cloud yet".into()),Location::Local => match &image.local {// A provider is its own engine: "macOS VMs on this Mac".Some(l @ LocalEngine::External(_)) => l.label_on(os),@@ -3608,16 +3512,14 @@ pub fn view_on(state: &WizardState, env: &WizardEnv, os: SpaceOs) -> WizardViewlet (cpus, memory_gb) = effective_size(state, env);let ((min_cpus, max_cpus), (min_memory_gb, max_memory_gb)) = size_ranges(placement, env);// No price on the user's own hardware (this Mac, one of your machines,- // or a machine added by address): only placements that bill show one.+ // or a machine added by address): only a cloud of yours shows one.let price = if local|| matches!(placement, Location::Host | Location::Auto)|| state.mode == WizardMode::Address{None- } else if yours {- offer.and_then(|o| cloud_price_text(o.usd_per_hour))} else {- price_text(env.cloud_pricing.as_ref(), cpus, memory_gb)+ offer.and_then(|o| cloud_price_text(o.usd_per_hour))};// When a Space in your cloud deletes itself.let lifetime = cloud.filter(|_| yours).map(|c| ttl_text(c.ttl_hours));@@ -3924,21 +3826,28 @@ pub fn view_on(state: &WizardState, env: &WizardEnv, os: SpaceOs) -> WizardViewmod tests {use super::*;- /// `s` placed in Cua Cloud, which the apps do not offer- /// ([`crate::model::CLOUD_SPACES_OFFERED`]) and `reduce` refuses: the- /// cloud paths stay covered for when they do.+ /// `s` placed in the user's own cloud (no estimate of its own: the+ /// remote paths of the view).fn in_cloud(s: &WizardState) -> WizardState {WizardState {- placement: Location::Cloud,+ placement: Location::Yours,picked: true,..s.clone()}}+ /// `e` with one connected cloud of the user's, so a placement in it holds.+ fn with_cloud(e: &WizardEnv) -> WizardEnv {+ WizardEnv {+ clouds: vec![aws()],+ experiments: your_cloud_on(),+ ..e.clone()+ }+ }+fn env() -> WizardEnv {WizardEnv {default_location: Location::Local,- cloud_available: false,local_available: true,local_reason: None,local_backends: Some(vec!["docker".into()]),@@ -3948,7 +3857,6 @@ mod tests {lume_source: None,linux_source: None,storage: None,- cloud_pricing: None,clouds: vec![],hosts: vec![],experiments: your_cloud_off(),@@ -4115,7 +4023,6 @@ mod tests {/// This Mac: 212 GB free on the startup disk, 40 GB in Colima.fn storage_env() -> WizardEnv {WizardEnv {- cloud_available: true,local_backends: None,storage: Some(LocalStorage {reserve_bytes: 5 * GIB,@@ -4374,9 +4281,9 @@ mod tests {.all(|f| f.label != "Download" && f.label != "Disk"));let mut remote = s;- remote.placement = Location::Cloud;+ remote.placement = Location::Yours;assert!(- !view(&remote, &e)+ !view(&remote, &with_cloud(&e)).resource_facts.iter().any(|f| f.value.contains("one-time Linux runtime download"))@@ -4558,17 +4465,13 @@ mod tests {);assert_eq!(other.disk_gb, None);let cloud = in_cloud(&s);- let v = view(&cloud, &e);+ let v = view(&cloud, &with_cloud(&e));assert!(!v.disk_editable && v.plan.disk_gb.is_none());assert_eq!(facts(&v),[("Kind".into(), "Virtual machine".into()),- ("Architecture".into(), "x64".into()),- (- "Disk".into(),- size_text(sizes("ghcr.io/trycua/linux:24.04-disk", "amd64").disk)- ),+ ("Deletes itself".into(), "After 8 hours".into()),]);}@@ -4676,10 +4579,10 @@ mod tests {.summary;let a = summary.iter().find(|f| f.label == "Architecture").unwrap();assert_eq!(a.value, "x64 (emulated)");- // No warning in the cloud, or on an x64 Mac.+ // No warning in your cloud, or on an x64 Mac.let cloud = in_cloud(&s);assert!(- view(&cloud, &e)+ view(&cloud, &with_cloud(&e)).resource_facts.iter().all(|f| f.symbol.is_none())@@ -4727,7 +4630,6 @@ mod tests {runtime_options(&linux, Location::Local),[Runtime::Auto, Runtime::Gvisor, Runtime::Runc]);- assert_eq!(runtime_options(&linux, Location::Cloud), [Runtime::Gvisor]);let kinds = kind_options(&linux, Location::Local);assert_eq!(kinds.len(), 2);assert_eq!(kinds[1].image.image_ref, "ghcr.io/trycua/linux:24.04-disk");@@ -4813,21 +4715,6 @@ mod tests {}}- /// Cua Cloud's default rates.- const RATES: CloudPricing = CloudPricing {- vcpu_hour_usd: 0.044625,- memory_gib_hour_usd: 0.0223125,- };-- fn cloud_env(pricing: Option<CloudPricing>) -> WizardEnv {- WizardEnv {- default_location: Location::Cloud,- cloud_available: true,- cloud_pricing: pricing,- ..env()- }- }-#[test]fn a_linked_cloud_is_in_run_on_by_default() {let e = WizardEnv {@@ -4854,22 +4741,12 @@ mod tests {#[test]fn your_cloud_is_disabled_until_one_is_connected() {- // A Cua Cloud default still starts on this Mac, and there is no- // Cua Cloud tile while the apps do not offer it.- let e = WizardEnv {- default_location: Location::Cloud,- cloud_available: true,- ..env()- };+ let e = env();let s = initial(&e);assert_eq!(s.placement, Location::Local);let v = view(&s, &e);let ids: Vec<&str> = v.placements.iter().map(|o| o.id.as_str()).collect();- assert_eq!(- ids,- ["local"],- "This Mac only: no Cua Cloud, nothing connected"- );+ assert_eq!(ids, ["local"], "This Mac only: nothing connected");assert!(v.placements[0].selected && v.placements[0].enabled);assert_eq!(v.placement_id, "local");assert!(@@ -4894,14 +4771,6 @@ mod tests {&e,);assert_eq!(picked.placement, Location::Local);- let synced = reduce(- &s,- &WizardAction::SyncDefault {- location: Location::Cloud,- },- &e,- );- assert_eq!(synced.placement, Location::Local);let yours_default = WizardEnv {default_location: Location::Yours,..e@@ -5645,96 +5514,6 @@ mod tests {assert_eq!(view(&mini, &gone).placement_id, "local");}- #[test]- fn cloud_spaces_are_sized_within_the_everyday_range_and_priced() {- let e = cloud_env(Some(RATES));- let mut s = in_cloud(&reduce(&initial(&e), &WizardAction::Next, &e));- let v = view(&s, &e);- assert_eq!(v.step, 1);- let ids: Vec<&str> = v.fields.iter().map(|f| f.id.as_str()).collect();- assert_eq!(ids, ["cpus", "memory"], "sliders, no disk in the cloud");- assert_eq!((v.min_cpus, v.max_cpus), CLOUD_CPU_RANGE);- assert_eq!((v.min_memory_gb, v.max_memory_gb), CLOUD_MEMORY_GB_RANGE);- // Linux defaults: 2 vCPUs + 4 GB = $0.08925 + $0.08925.- assert_eq!(v.price.as_deref(), Some("About $0.18/hour"));- s = reduce(&s, &WizardAction::SetCpus { cpus: 64 }, &e);- s = reduce(&s, &WizardAction::SetMemory { memory_gb: 1024 }, &e);- let v = view(&s, &e);- assert_eq!(- (v.cpus, v.memory_gb),- (8, 32),- "clamped to the everyday cloud range"- );- assert_eq!(v.price.as_deref(), Some("About $1.07/hour"));- s = reduce(&s, &WizardAction::SetCpus { cpus: 0 }, &e);- s = reduce(&s, &WizardAction::SetMemory { memory_gb: 0 }, &e);- let v = view(&s, &e);- assert_eq!((v.cpus, v.memory_gb), (1, 2));- assert_eq!(v.price.as_deref(), Some("About $0.09/hour"));- // The plan and the SDK call carry the cloud size.- let args = create_args(&v.plan);- assert_eq!(- (args.cpus, args.memory_mb, args.disk_gb),- (Some(1), Some(2048), None)- );- s.step = 3;- let v = view(&s, &e);- let fact = |l: &str| {- v.summary- .iter()- .find(|f| f.label == l)- .map(|f| f.value.clone())- };- assert_eq!(fact("Resources").as_deref(), Some("1 core, 2 GB memory"));- assert_eq!(fact("Cost").as_deref(), Some("About $0.09/hour"));- }-- #[test]- fn no_cloud_rates_no_estimate_and_no_price_locally() {- let e = cloud_env(None);- let mut s = in_cloud(&reduce(&initial(&e), &WizardAction::Next, &e));- assert_eq!(view(&s, &e).price, None, "never a guessed price");- s.step = 3;- assert!(view(&s, &e).summary.iter().all(|f| f.label != "Cost"));- for bad in [0.0, -1.0, f64::NAN, f64::INFINITY] {- let p = CloudPricing {- vcpu_hour_usd: bad,- ..RATES- };- assert_eq!(price_text(Some(&p), 2, 4), None, "{bad}");- }- let e = WizardEnv {- cloud_pricing: Some(RATES),- ..env()- };- let s = reduce(&initial(&e), &WizardAction::Next, &e);- assert_eq!(view(&s, &e).price, None, "no price on your own hardware");- // A machine added by address is your hardware too.- let s = reduce(&s, &WizardAction::ShowAddress, &e);- assert_eq!(view(&s, &e).price, None);- }-- #[test]- fn a_size_follows_the_placement_limits() {- // 16 GB chosen locally is kept in the cloud; 12 vCPUs fit neither- // this 8-core Mac nor the cloud cap.- let e = WizardEnv {- cloud_available: true,- max_cpus: 12,- cloud_pricing: Some(RATES),- ..env()- };- let mut s = reduce(&initial(&e), &WizardAction::SetCpus { cpus: 12 }, &e);- s = reduce(&s, &WizardAction::SetMemory { memory_gb: 16 }, &e);- assert_eq!((view(&s, &e).cpus, view(&s, &e).memory_gb), (12, 16));- s = in_cloud(&s);- let v = view(&s, &e);- assert_eq!((v.cpus, v.memory_gb), (CLOUD_CPU_RANGE.1, 16));- assert_eq!(v.plan.cpus, Some(CLOUD_CPU_RANGE.1));- // 8 x 0.044625 + 16 x 0.0223125 = 0.714.- assert_eq!(v.price.as_deref(), Some("About $0.71/hour"));- }-#[test]fn address_shapes() {assert!(looks_like_address("10.0.0.5:3211"));diff --git a/libs/cua/crates/cua-spaces-app-core/tests/external_runtimes.rs b/libs/cua/crates/cua-spaces-app-core/tests/external_runtimes.rsindex 5bb0679ffd..faf628e3e3 100644--- a/libs/cua/crates/cua-spaces-app-core/tests/external_runtimes.rs+++ b/libs/cua/crates/cua-spaces-app-core/tests/external_runtimes.rs@@ -42,7 +42,6 @@ fn report(ready: bool) -> String {fn env(backends: &[&str]) -> WizardEnv {WizardEnv {default_location: Location::Local,- cloud_available: false,local_available: true,local_reason: None,local_backends: Some(backends.iter().map(|b| b.to_string()).collect()),@@ -52,7 +51,6 @@ fn env(backends: &[&str]) -> WizardEnv {lume_source: None,linux_source: None,storage: None,- cloud_pricing: None,clouds: vec![],hosts: vec![],experiments: Experiments::default(),@@ -159,7 +157,6 @@ fn a_registered_provider_joins_the_wizard_and_leaves_it_again() {assert_eq!(image.variant, SpaceKind::Vm);assert_eq!(image.name, "Default");assert_eq!(image.local, Some(LocalEngine::External("acme".into())));- assert_eq!(image.cloud, None);assert_eq!(image.arch, ["arm64"]);assert!(wizard::image_suggestions("acme")@@ -170,7 +167,7 @@ fn a_registered_provider_joins_the_wizard_and_leaves_it_again() {// It runs only on this Mac, only on the provider.assert!(wizard::can_place(&image, Location::Local));- for on in [Location::Cloud, Location::Yours, Location::Host] {+ for on in [Location::Yours, Location::Host] {assert!(!wizard::can_place(&image, on), "{on:?}");}assert_eq!(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.rsindex 1540347a86..f7c996c032 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@@ -73,8 +73,6 @@ pub enum AppThumbnailScene {pub type AppSpaceProvider = core::model::SpaceProvider;#[uniffi::remote(Enum)]pub enum AppSpaceProvider {- /// Cua Cloud.- Cloud,/// This Mac.Local,/// A machine added by address.@@ -109,9 +107,6 @@ pub struct AppSpaceProgress {pub label: String,/// Why the create failed.pub error: Option<String>,- /// It failed because the account is out of Cua Cloud credit: the- /// website billing page "Add credit" opens.- pub credit_url: Option<String>,/// While it downloads: "4.2 of 22.1 GB · 85 MB/s · about 4 min"/// ([`crate::spaces::creating::transfer_text`]).pub transfer: Option<String>,@@ -205,8 +200,6 @@ pub struct AppSpace {pub started_at: Option<i64>,/// Placeholder scene.pub scene: AppThumbnailScene,- /// Group (cloud namespace or location word).- pub fleet_id: Option<String>,/// Fixture machine size.pub size: Option<String>,/// Fixture region.@@ -314,9 +307,6 @@ pub struct AppSpaceRow {pub type AppLocation = core::model::Location;#[uniffi::remote(Enum)]pub enum AppLocation {- /// Cua Cloud (the SDK's `on="cloud"`). The apps do not offer it for new- /// Spaces ([`CLOUD_SPACES_OFFERED`]); existing cloud Spaces still list.- Cloud,/// This Mac.Local,/// The user's own cloud account (AWS, Google Cloud, Hetzner, Modal), connected@@ -361,8 +351,6 @@ pub enum AppRuntime {Qemu,/// Lume.Lume,- /// KubeVirt.- Kubevirt,/// An external runtime provider installed on this machine, by its name/// (the `<name>` of its `cua-runtime-<name>` executable).Other(String),@@ -523,8 +511,6 @@ pub struct AppPendingCreate {pub permille: u32,/// Why it failed.pub error: Option<String>,- /// It failed for want of Cua Cloud credit: the billing page.- pub credit_url: Option<String>,/// The registered Space's id once it finished; the row goes when the/// registry lists it.pub space_id: Option<String>,@@ -838,7 +824,7 @@ pub struct AppSidebarRow {pub type AppSidebarSection = core::spaces::sidebar::SidebarSection;#[uniffi::remote(Record)]pub struct AppSidebarSection {- /// "Cua Cloud", "This Mac", "Connected", "My computers"+ /// "This Mac", "Connected", "My computers"/// (`spaces.sidebar.section.*`).pub title: AppMsg,/// Rows.@@ -1076,9 +1062,6 @@ pub struct AppSpaceDetail {pub confirm: AppDeleteConfirm,/// The sections under the facts, in order (Stream, Agents, Teleport).pub sections: Vec<String>,- /// A cloud Space refused for want of credit: one line and "Add- /// credit" (the website billing page).- pub credit_notice: Option<AppCreditNotice>,/// Why turning it off or on failed, shown inline under the preview.pub power_error: Option<String>,/// Signed in, but this device is not enrolled: a machine reached@@ -1353,7 +1336,7 @@ pub enum AppWindowMode {/// has room to hang below the notch. Same top-centre placement as `Ambient`.AmbientTeleport,Switcher,- CreateFleet,+ CreateSpace,}/// `notch::geometry::LogicalRect`.@@ -3133,16 +3116,6 @@ pub struct AppExternalRuntime {pub images: Vec<AppExternalImage>,}-/// The image list's cloud engine.-pub type AppCloudEngine = core::wizard::CloudEngine;-#[uniffi::remote(Enum)]-pub enum AppCloudEngine {- /// gVisor containers.- Gvisor,- /// KubeVirt VMs.- Kubevirt,-}-/// The catalog's image tier (canonical images only).pub type AppImageTier = core::wizard::ImageTier;#[uniffi::remote(Enum)]@@ -3216,8 +3189,6 @@ pub struct AppSandboxImage {pub spacesd: bool,/// Local engine.pub local: Option<AppLocalEngine>,- /// Cloud engine.- pub cloud: Option<AppCloudEngine>,/// `slim`, `full` or `xcode` (canonical images only).pub tier: Option<AppImageTier>,/// Offered in pickers.@@ -3284,16 +3255,6 @@ pub struct AppLocalStorage {pub linux_runtime_download_bytes: u64,}-/// Cua Cloud rates for this account.-pub type AppCloudPricing = core::wizard::CloudPricing;-#[uniffi::remote(Record)]-pub struct AppCloudPricing {- /// USD per reserved vCPU per hour.- pub vcpu_hour_usd: f64,- /// USD per reserved GB (GiB) of memory per hour.- pub memory_gib_hour_usd: f64,-}-/// What one connected cloud can run for an image family, and at what cost/// (a `cloud_status` provider's `kinds` row).pub type AppCloudOffer = core::wizard::CloudOffer;@@ -3455,8 +3416,6 @@ pub type AppWizardEnv = core::wizard::WizardEnv;pub struct AppWizardEnv {/// Where "Run on" starts (Settings, `cua config set default.on`).pub default_location: AppLocation,- /// Signed in (or client credentials).- pub cloud_available: bool,/// A local container backend or Lume exists.pub local_available: bool,/// Why local is unavailable.@@ -3480,8 +3439,6 @@ pub struct AppWizardEnv {/// Free space and pulled images here (the SDK's `Local.storage()`),/// when known.pub storage: Option<AppLocalStorage>,- /// This account's Cua Cloud rates, when known (no estimate without).- pub cloud_pricing: Option<AppCloudPricing>,/// The user's connected clouds (`cloud_status`), for "Your cloud"/// (offered only while its experiment is on: [`offered_clouds`]).pub clouds: Vec<AppConnectedCloud>,@@ -3810,9 +3767,9 @@ pub struct AppCreatePlan {pub runtime: AppRuntime,/// Name, when given.pub name: Option<String>,- /// vCPUs (local and Cua Cloud).+ /// vCPUs (local and remote).pub cpus: Option<u32>,- /// Memory MB (local and Cua Cloud).+ /// Memory MB (local and remote).pub memory_mb: Option<u32>,/// Local VMs only: grow the disk to this many GB (larger than the/// image's).@@ -5404,51 +5361,6 @@ pub enum KvOutcome {},}-/// The saved card (never its number).-pub type AppBillingCard = core::billing::BillingCard;-#[uniffi::remote(Record)]-pub struct AppBillingCard {- /// `visa`, `mastercard`, ...- pub brand: String,- /// Last four digits.- pub last4: String,-}--/// The account's Cua Cloud credit.-pub type AppBillingCredit = core::billing::BillingCredit;-#[uniffi::remote(Record)]-pub struct AppBillingCredit {- /// What is left, US cents.- pub balance_usd_cents: i64,-}--/// The account's billing, as the apps read it.-pub type AppBillingStatus = core::billing::BillingStatus;-#[uniffi::remote(Record)]-pub struct AppBillingStatus {- /// Billing is on for this account (off: Settings shows no Billing row).- pub billing_enabled: bool,- /// The saved default card.- pub card: Option<AppBillingCard>,- /// The account's credit, when it has any.- pub credit: Option<AppBillingCredit>,- /// The website billing page (credit, cards, plans).- pub billing_url: Option<String>,-}--/// A cloud Space refused for want of credit: the line, the button, and the-/// website billing page it opens.-pub type AppCreditNotice = core::billing::CreditNotice;-#[uniffi::remote(Record)]-pub struct AppCreditNotice {- /// [`OUT_OF_CREDIT`].- pub text: String,- /// [`ADD_CREDIT`].- pub button: String,- /// The website billing page.- pub url: String,-}-/// `volume_mount_status`.pub type AppDriveMountInput = core::drive_settings::DriveMountInput;#[uniffi::remote(Record)]@@ -6858,7 +6770,9 @@ pub struct AppSettings {pub menu_bar: bool,/// Switcher theme.pub theme: AppSwitcherTheme,- /// Where New Space starts.+ /// Where New Space starts. A word this build does not know (the+ /// retired `cloud`) reads as this Mac, so an old file keeps its other+ /// settings.pub default_location: AppLocation,/// Hide the notch over full-screen apps.pub hide_in_full_screen: bool,@@ -6968,7 +6882,7 @@ pub type AppSettingsInput = core::settings::SettingsInput;pub struct AppSettingsInput {/// The signed-in account.pub identity: Option<String>,- /// Cua Cloud through client credentials (an API key): its client id.+ /// The Cua account through client credentials (an API key): its client id.pub api_key_client: Option<String>,/// The sign-in in progress.pub sign_in: AppSignInPhase,@@ -6977,10 +6891,6 @@ pub struct AppSettingsInput {/// The Spaces tab is hidden from the notch (the menu bar item is the/// entry point).pub menu_bar: bool,- /// Where New Space starts.- pub default_location: AppLocation,- /// The environment sets the default location: which variable.- pub location_locked_by: Option<String>,/// The telemetry switch (none until read).pub telemetry: Option<AppTelemetryInput>,/// Coding agents (none while detecting).@@ -6993,8 +6903,6 @@ pub struct AppSettingsInput {/// app's URL. None: the Teams section shows the production account/// app's links only.pub teams: Option<AppTeamsInput>,- /// The account's Cua Cloud billing, once read (signed in).- pub billing: Option<AppBillingStatus>,/// Launch at login, once the system was asked (none: no rows).pub login_item: Option<AppLoginItemInput>,/// Settings, Experiments (what the page mentions follows them).@@ -7162,7 +7070,7 @@ pub type AppSignInFooterInput = core::sign_in::SignInFooterInput;pub struct AppSignInFooterInput {/// The signed-in account.pub identity: Option<String>,- /// Cua Cloud works through client credentials (an API key).+ /// The Cua account works through client credentials (an API key).pub cloud_configured: bool,/// Signing in is possible here.pub can_sign_in: bool,@@ -7219,7 +7127,7 @@ pub type AppChromeInput = core::window::ChromeInput;pub struct AppChromeInput {/// The signed-in account.pub identity: Option<String>,- /// Cua Cloud works (signed in, or client credentials).+ /// The Cua account works (signed in, or client credentials).pub cloud_configured: bool,/// Signing in is possible here (the native shell).pub can_sign_in: bool,diff --git a/libs/cua/scripts/generate-app-core-ffi.py b/libs/cua/scripts/generate-app-core-ffi.pyindex f804640821..9997ab3ec2 100644--- a/libs/cua/scripts/generate-app-core-ffi.py+++ b/libs/cua/scripts/generate-app-core-ffi.py@@ -36,7 +36,7 @@ TYPES = [("teleport/grid.rs", "teleport::grid", ["PickerTileIcon", "PickerTileThumbnail", "PickerTile", "PickerTileSection", "PickerGrid", "PickerGridTab", "PickerGridTabItem", "PickerGridPrimary"]),("teleport/review.rs", "teleport::review", ["SendSource", "RememberedChoice", "ReviewDomain", "ReviewToggle", "VaultPassword", "ReviewPassword", "VaultSource", "ReviewChoice"]),("teleport/flow.rs", "teleport::flow", ["Capability", "Move", "SensitiveGroup", "SensitiveOption", "CatalogEntry", "ConsentKind", "ConsentItem", "PlanStepView", "Plan", "RunPhase", "RunEvent", "RunReport", "Consent", "InstallCuaPrompt", "Step", "PickerState", "PickerEvent", "EntrySection", "ReviewView"]),- ("wizard.rs", "wizard", ["LocalEngine", "ExternalImage", "ExternalRuntimeInfo", "CloudEngine", "ImageTier", "ImageDistro", "PlatformSize", "ImageSizes", "SandboxImage", "ImageGroup", "KindOption", "StorageVolume", "LocalStorage", "CloudPricing", "CloudOffer", "ConnectedCloud", "HostLimit", "HostLoad", "SpaceHost", "RuntimeSwitch", "PlacementOption", "GpuChoice", "WizardEnv", "WizardMode", "AddressForm", "ResourceField", "ResourceEdit", "WizardState", "WizardAction", "StepState", "StepView", "Tile", "MenuOption", "CreatePlan", "CreateSpaceArgs", "AddressView", "AddressSubmit", "ImageSuggestion", "SuggestionGroup", "ImageFieldView", "WizardField", "WizardLabels", "WizardFact", "GpuRow", "ResourceEditView", "WizardView"]),+ ("wizard.rs", "wizard", ["LocalEngine", "ExternalImage", "ExternalRuntimeInfo", "ImageTier", "ImageDistro", "PlatformSize", "ImageSizes", "SandboxImage", "ImageGroup", "KindOption", "StorageVolume", "LocalStorage", "CloudOffer", "ConnectedCloud", "HostLimit", "HostLoad", "SpaceHost", "RuntimeSwitch", "PlacementOption", "GpuChoice", "WizardEnv", "WizardMode", "AddressForm", "ResourceField", "ResourceEdit", "WizardState", "WizardAction", "StepState", "StepView", "Tile", "MenuOption", "CreatePlan", "CreateSpaceArgs", "AddressView", "AddressSubmit", "ImageSuggestion", "SuggestionGroup", "ImageFieldView", "WizardField", "WizardLabels", "WizardFact", "GpuRow", "ResourceEditView", "WizardView"]),("keyvault/wire.rs", "keyvault::wire", ["KvItemPolicy", "KvItem", "KvFavicon", "KvDomainCount", "KvInventory", "KvSigning", "KvCaller", "KvSelector", "KvAccessRequest", "KvPending", "KvGrant", "KvRuleCaller", "KvRule", "KvDelivery", "KvAuditEntry", "KvStatus", "KvVerification", "KeyvaultOverview", "KvCommand"]),("keyvault/view.rs", "keyvault::view", ["Tone", "SigningBadge", "Tri", "DecisionTone", "Decision", "PendingRow", "AccessKind", "AccessRow", "KvLabels", "KeyvaultPage"]),("keyvault/vault.rs", "keyvault::vault", ["KvKind", "KvLock", "VaultState", "VaultAction", "VaultRow", "VaultSite", "VaultFiles", "VaultApp", "VaultSelection", "VaultView", "UnlockPrompt", "KvDeleteConfirm", "KvVaultSource"]),@@ -44,7 +44,6 @@ TYPES = [("keyvault/approval.rs", "keyvault::approval", ["ApprovalState", "ApprovalAction", "ApprovalRow", "ApprovalView"]),("keyvault/credential.rs", "keyvault::credential", ["KvFormMode", "KvMethod", "KvCredentialForm", "KvStrength", "KvPassphraseCheck"]),("keyvault/client.rs", "keyvault::client", ["KvOutcome"]),- ("billing.rs", "billing", ["BillingCard", "BillingCredit", "BillingStatus", "CreditNotice"]),("drive_settings.rs", "drive_settings", ["DriveMountInput", "DriveS3Input", "DriveStorageInput", "DriveCheckInput", "DriveCacheInput", "StorageInput", "DriveStorageUpdate", "StorageForm", "StorageField", "StorageRequest", "StorageState", "StorageAction"]),("onboarding.rs", "onboarding", ["OnboardingStep", "DriveStepRequest", "StorageChoice", "OnboardingMode", "OnboardingState", "OnboardingAction", "OnboardingTodoId", "OnboardingTodo", "StepDot", "UsageToggle", "ModeChoice", "OnboardingView", "DriveCard", "PresentationCard", "OnboardingCopy", "OnboardingCheckbox"]),("onboarding_preview.rs", "onboarding_preview", ["PreviewPoint", "NotchPreview", "MenuPreviewRow", "MenuPreview", "PresentationPreview", "PreviewFrame"]),diff --git a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swiftindex ee934548b2..916eb29098 100644--- a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift+++ b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift@@ -6184,214 +6184,6 @@ public func FfiConverterTypeAppAuditInput_lower(_ value: AppAuditInput) -> RustB}-public struct AppBillingCard: Equatable, Hashable {- /**- * `visa`, `mastercard`, ...- */- public var brand: String- /**- * Last four digits.- */- public var last4: String-- // Default memberwise initializers are never public by default, so we- // declare one manually.- public init(- /**- * `visa`, `mastercard`, ...- */brand: String,- /**- * Last four digits.- */last4: String) {- self.brand = brand- self.last4 = last4- }-----}--#if compiler(>=6)-extension AppBillingCard: Sendable {}-#endif--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public struct FfiConverterTypeAppBillingCard: FfiConverterRustBuffer {- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppBillingCard {- return- try AppBillingCard(- brand: FfiConverterString.read(from: &buf),- last4: FfiConverterString.read(from: &buf)- )- }-- public static func write(_ value: AppBillingCard, into buf: inout [UInt8]) {- FfiConverterString.write(value.brand, into: &buf)- FfiConverterString.write(value.last4, into: &buf)- }-}---#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppBillingCard_lift(_ buf: RustBuffer) throws -> AppBillingCard {- return try FfiConverterTypeAppBillingCard.lift(buf)-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppBillingCard_lower(_ value: AppBillingCard) -> RustBuffer {- return FfiConverterTypeAppBillingCard.lower(value)-}---public struct AppBillingCredit: Equatable, Hashable {- /**- * What is left, US cents.- */- public var balanceUsdCents: Int64-- // Default memberwise initializers are never public by default, so we- // declare one manually.- public init(- /**- * What is left, US cents.- */balanceUsdCents: Int64) {- self.balanceUsdCents = balanceUsdCents- }-----}--#if compiler(>=6)-extension AppBillingCredit: Sendable {}-#endif--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public struct FfiConverterTypeAppBillingCredit: FfiConverterRustBuffer {- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppBillingCredit {- return- try AppBillingCredit(- balanceUsdCents: FfiConverterInt64.read(from: &buf)- )- }-- public static func write(_ value: AppBillingCredit, into buf: inout [UInt8]) {- FfiConverterInt64.write(value.balanceUsdCents, into: &buf)- }-}---#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppBillingCredit_lift(_ buf: RustBuffer) throws -> AppBillingCredit {- return try FfiConverterTypeAppBillingCredit.lift(buf)-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppBillingCredit_lower(_ value: AppBillingCredit) -> RustBuffer {- return FfiConverterTypeAppBillingCredit.lower(value)-}---public struct AppBillingStatus: Equatable, Hashable {- /**- * Billing is on for this account (off: Settings shows no Billing row).- */- public var billingEnabled: Bool- /**- * The saved default card.- */- public var card: AppBillingCard?- /**- * The account's credit, when it has any.- */- public var credit: AppBillingCredit?- /**- * The website billing page (credit, cards, plans).- */- public var billingUrl: String?-- // Default memberwise initializers are never public by default, so we- // declare one manually.- public init(- /**- * Billing is on for this account (off: Settings shows no Billing row).- */billingEnabled: Bool,- /**- * The saved default card.- */card: AppBillingCard?,- /**- * The account's credit, when it has any.- */credit: AppBillingCredit?,- /**- * The website billing page (credit, cards, plans).- */billingUrl: String?) {- self.billingEnabled = billingEnabled- self.card = card- self.credit = credit- self.billingUrl = billingUrl- }-----}--#if compiler(>=6)-extension AppBillingStatus: Sendable {}-#endif--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public struct FfiConverterTypeAppBillingStatus: FfiConverterRustBuffer {- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppBillingStatus {- return- try AppBillingStatus(- billingEnabled: FfiConverterBool.read(from: &buf),- card: FfiConverterOptionTypeAppBillingCard.read(from: &buf),- credit: FfiConverterOptionTypeAppBillingCredit.read(from: &buf),- billingUrl: FfiConverterOptionString.read(from: &buf)- )- }-- public static func write(_ value: AppBillingStatus, into buf: inout [UInt8]) {- FfiConverterBool.write(value.billingEnabled, into: &buf)- FfiConverterOptionTypeAppBillingCard.write(value.card, into: &buf)- FfiConverterOptionTypeAppBillingCredit.write(value.credit, into: &buf)- FfiConverterOptionString.write(value.billingUrl, into: &buf)- }-}---#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppBillingStatus_lift(_ buf: RustBuffer) throws -> AppBillingStatus {- return try FfiConverterTypeAppBillingStatus.lift(buf)-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppBillingStatus_lower(_ value: AppBillingStatus) -> RustBuffer {- return FfiConverterTypeAppBillingStatus.lower(value)-}--public struct AppCatalogEntry: Equatable, Hashable {/*** Id.@@ -7088,7 +6880,7 @@ public struct AppChromeInput: Equatable, Hashable {*/public var identity: String?/**- * Cua Cloud works (signed in, or client credentials).+ * The Cua account works (signed in, or client credentials).*/public var cloudConfigured: Bool/**@@ -7108,7 +6900,7 @@ public struct AppChromeInput: Equatable, Hashable {* The signed-in account.*/identity: String?,/**- * Cua Cloud works (signed in, or client credentials).+ * The Cua account works (signed in, or client credentials).*/cloudConfigured: Bool,/*** Signing in is possible here (the native shell).@@ -8154,72 +7946,6 @@ public func FfiConverterTypeAppCloudOffer_lower(_ value: AppCloudOffer) -> RustB}-public struct AppCloudPricing: Equatable, Hashable {- /**- * USD per reserved vCPU per hour.- */- public var vcpuHourUsd: Double- /**- * USD per reserved GB (GiB) of memory per hour.- */- public var memoryGibHourUsd: Double-- // Default memberwise initializers are never public by default, so we- // declare one manually.- public init(- /**- * USD per reserved vCPU per hour.- */vcpuHourUsd: Double,- /**- * USD per reserved GB (GiB) of memory per hour.- */memoryGibHourUsd: Double) {- self.vcpuHourUsd = vcpuHourUsd- self.memoryGibHourUsd = memoryGibHourUsd- }-----}--#if compiler(>=6)-extension AppCloudPricing: Sendable {}-#endif--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public struct FfiConverterTypeAppCloudPricing: FfiConverterRustBuffer {- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppCloudPricing {- return- try AppCloudPricing(- vcpuHourUsd: FfiConverterDouble.read(from: &buf),- memoryGibHourUsd: FfiConverterDouble.read(from: &buf)- )- }-- public static func write(_ value: AppCloudPricing, into buf: inout [UInt8]) {- FfiConverterDouble.write(value.vcpuHourUsd, into: &buf)- FfiConverterDouble.write(value.memoryGibHourUsd, into: &buf)- }-}---#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppCloudPricing_lift(_ buf: RustBuffer) throws -> AppCloudPricing {- return try FfiConverterTypeAppCloudPricing.lift(buf)-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppCloudPricing_lower(_ value: AppCloudPricing) -> RustBuffer {- return FfiConverterTypeAppCloudPricing.lower(value)-}--public struct AppCloudProviderInput: Equatable, Hashable {/*** `aws`, `gcp`, `hetzner`, `modal`.@@ -9402,11 +9128,11 @@ public struct AppCreatePlan: Equatable, Hashable {*/public var name: String?/**- * vCPUs (local and Cua Cloud).+ * vCPUs (local and remote).*/public var cpus: UInt32?/**- * Memory MB (local and Cua Cloud).+ * Memory MB (local and remote).*/public var memoryMb: UInt32?/**@@ -9450,10 +9176,10 @@ public struct AppCreatePlan: Equatable, Hashable {* Name, when given.*/name: String?,/**- * vCPUs (local and Cua Cloud).+ * vCPUs (local and remote).*/cpus: UInt32?,/**- * Memory MB (local and Cua Cloud).+ * Memory MB (local and remote).*/memoryMb: UInt32?,/*** Local VMs only: grow the disk to this many GB (larger than the@@ -9784,82 +9510,6 @@ public func FfiConverterTypeAppCreatesState_lower(_ value: AppCreatesState) -> R}-public struct AppCreditNotice: Equatable, Hashable {- /**- * [`OUT_OF_CREDIT`].- */- public var text: String- /**- * [`ADD_CREDIT`].- */- public var button: String- /**- * The website billing page.- */- public var url: String-- // Default memberwise initializers are never public by default, so we- // declare one manually.- public init(- /**- * [`OUT_OF_CREDIT`].- */text: String,- /**- * [`ADD_CREDIT`].- */button: String,- /**- * The website billing page.- */url: String) {- self.text = text- self.button = button- self.url = url- }-----}--#if compiler(>=6)-extension AppCreditNotice: Sendable {}-#endif--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public struct FfiConverterTypeAppCreditNotice: FfiConverterRustBuffer {- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppCreditNotice {- return- try AppCreditNotice(- text: FfiConverterString.read(from: &buf),- button: FfiConverterString.read(from: &buf),- url: FfiConverterString.read(from: &buf)- )- }-- public static func write(_ value: AppCreditNotice, into buf: inout [UInt8]) {- FfiConverterString.write(value.text, into: &buf)- FfiConverterString.write(value.button, into: &buf)- FfiConverterString.write(value.url, into: &buf)- }-}---#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppCreditNotice_lift(_ buf: RustBuffer) throws -> AppCreditNotice {- return try FfiConverterTypeAppCreditNotice.lift(buf)-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppCreditNotice_lower(_ value: AppCreditNotice) -> RustBuffer {- return FfiConverterTypeAppCreditNotice.lower(value)-}--public struct AppDaemonCheck: Equatable, Hashable {/*** The running daemon's executable (`None`: no daemon, or unknown).@@ -26963,10 +26613,6 @@ public struct AppPendingCreate: Equatable, Hashable {* Why it failed.*/public var error: String?- /**- * It failed for want of Cua Cloud credit: the billing page.- */- public var creditUrl: String?/*** The registered Space's id once it finished; the row goes when the* registry lists it.@@ -27082,9 +26728,6 @@ public struct AppPendingCreate: Equatable, Hashable {/*** Why it failed.*/error: String?,- /**- * It failed for want of Cua Cloud credit: the billing page.- */creditUrl: String?,/*** The registered Space's id once it finished; the row goes when the* registry lists it.@@ -27159,7 +26802,6 @@ public struct AppPendingCreate: Equatable, Hashable {self.pulled = pulledself.permille = permilleself.error = error- self.creditUrl = creditUrlself.spaceId = spaceIdself.image = imageself.kind = kind@@ -27205,7 +26847,6 @@ public struct FfiConverterTypeAppPendingCreate: FfiConverterRustBuffer {pulled: FfiConverterBool.read(from: &buf),permille: FfiConverterUInt32.read(from: &buf),error: FfiConverterOptionString.read(from: &buf),- creditUrl: FfiConverterOptionString.read(from: &buf),spaceId: FfiConverterOptionString.read(from: &buf),image: FfiConverterOptionString.read(from: &buf),kind: FfiConverterOptionTypeAppSpaceKind.read(from: &buf),@@ -27237,7 +26878,6 @@ public struct FfiConverterTypeAppPendingCreate: FfiConverterRustBuffer {FfiConverterBool.write(value.pulled, into: &buf)FfiConverterUInt32.write(value.permille, into: &buf)FfiConverterOptionString.write(value.error, into: &buf)- FfiConverterOptionString.write(value.creditUrl, into: &buf)FfiConverterOptionString.write(value.spaceId, into: &buf)FfiConverterOptionString.write(value.image, into: &buf)FfiConverterOptionTypeAppSpaceKind.write(value.kind, into: &buf)@@ -31999,10 +31639,6 @@ public struct AppSandboxImage: Equatable, Hashable {* Local engine.*/public var local: AppLocalEngine?- /**- * Cloud engine.- */- public var cloud: AppCloudEngine?/*** `slim`, `full` or `xcode` (canonical images only).*/@@ -32055,9 +31691,6 @@ public struct AppSandboxImage: Equatable, Hashable {/*** Local engine.*/local: AppLocalEngine?,- /**- * Cloud engine.- */cloud: AppCloudEngine?,/*** `slim`, `full` or `xcode` (canonical images only).*/tier: AppImageTier?,@@ -32084,7 +31717,6 @@ public struct AppSandboxImage: Equatable, Hashable {self.summary = summaryself.spacesd = spacesdself.local = local- self.cloud = cloudself.tier = tierself.published = publishedself.distro = distro@@ -32117,7 +31749,6 @@ public struct FfiConverterTypeAppSandboxImage: FfiConverterRustBuffer {summary: FfiConverterString.read(from: &buf),spacesd: FfiConverterBool.read(from: &buf),local: FfiConverterOptionTypeAppLocalEngine.read(from: &buf),- cloud: FfiConverterOptionTypeAppCloudEngine.read(from: &buf),tier: FfiConverterOptionTypeAppImageTier.read(from: &buf),published: FfiConverterBool.read(from: &buf),distro: FfiConverterOptionTypeAppImageDistro.read(from: &buf),@@ -32136,7 +31767,6 @@ public struct FfiConverterTypeAppSandboxImage: FfiConverterRustBuffer {FfiConverterString.write(value.summary, into: &buf)FfiConverterBool.write(value.spacesd, into: &buf)FfiConverterOptionTypeAppLocalEngine.write(value.local, into: &buf)- FfiConverterOptionTypeAppCloudEngine.write(value.cloud, into: &buf)FfiConverterOptionTypeAppImageTier.write(value.tier, into: &buf)FfiConverterBool.write(value.published, into: &buf)FfiConverterOptionTypeAppImageDistro.write(value.distro, into: &buf)@@ -32434,7 +32064,9 @@ public struct AppSettings: Equatable, Hashable {*/public var theme: AppSwitcherTheme/**- * Where New Space starts.+ * Where New Space starts. A word this build does not know (the+ * retired `cloud`) reads as this Mac, so an old file keeps its other+ * settings.*/public var defaultLocation: AppLocation/**@@ -32518,7 +32150,9 @@ public struct AppSettings: Equatable, Hashable {* Switcher theme.*/theme: AppSwitcherTheme,/**- * Where New Space starts.+ * Where New Space starts. A word this build does not know (the+ * retired `cloud`) reads as this Mac, so an old file keeps its other+ * settings.*/defaultLocation: AppLocation,/*** Hide the notch over full-screen apps.@@ -32670,7 +32304,7 @@ public struct AppSettingsInput: Equatable, Hashable {*/public var identity: String?/**- * Cua Cloud through client credentials (an API key): its client id.+ * The Cua account through client credentials (an API key): its client id.*/public var apiKeyClient: String?/**@@ -32686,14 +32320,6 @@ public struct AppSettingsInput: Equatable, Hashable {* entry point).*/public var menuBar: Bool- /**- * Where New Space starts.- */- public var defaultLocation: AppLocation- /**- * The environment sets the default location: which variable.- */- public var locationLockedBy: String?/*** The telemetry switch (none until read).*/@@ -32716,10 +32342,6 @@ public struct AppSettingsInput: Equatable, Hashable {* app's links only.*/public var teams: AppTeamsInput?- /**- * The account's Cua Cloud billing, once read (signed in).- */- public var billing: AppBillingStatus?/*** Launch at login, once the system was asked (none: no rows).*/@@ -32776,7 +32398,7 @@ public struct AppSettingsInput: Equatable, Hashable {* The signed-in account.*/identity: String?,/**- * Cua Cloud through client credentials (an API key): its client id.+ * The Cua account through client credentials (an API key): its client id.*/apiKeyClient: String?,/*** The sign-in in progress.@@ -32788,12 +32410,6 @@ public struct AppSettingsInput: Equatable, Hashable {* The Spaces tab is hidden from the notch (the menu bar item is the* entry point).*/menuBar: Bool,- /**- * Where New Space starts.- */defaultLocation: AppLocation,- /**- * The environment sets the default location: which variable.- */locationLockedBy: String?,/*** The telemetry switch (none until read).*/telemetry: AppTelemetryInput?,@@ -32811,9 +32427,6 @@ public struct AppSettingsInput: Equatable, Hashable {* app's URL. None: the Teams section shows the production account* app's links only.*/teams: AppTeamsInput?,- /**- * The account's Cua Cloud billing, once read (signed in).- */billing: AppBillingStatus?,/*** Launch at login, once the system was asked (none: no rows).*/loginItem: AppLoginItemInput?,@@ -32857,14 +32470,11 @@ public struct AppSettingsInput: Equatable, Hashable {self.signIn = signInself.canSignOut = canSignOutself.menuBar = menuBar- self.defaultLocation = defaultLocation- self.locationLockedBy = locationLockedByself.telemetry = telemetryself.agents = agentsself.agentsBusy = agentsBusyself.agentsPending = agentsPendingself.teams = teams- self.billing = billingself.loginItem = loginItemself.experiments = experimentsself.keyvaultAutoWipe = keyvaultAutoWipe@@ -32898,14 +32508,11 @@ public struct FfiConverterTypeAppSettingsInput: FfiConverterRustBuffer {signIn: FfiConverterTypeAppSignInPhase.read(from: &buf),canSignOut: FfiConverterBool.read(from: &buf),menuBar: FfiConverterBool.read(from: &buf),- defaultLocation: FfiConverterTypeAppLocation.read(from: &buf),- locationLockedBy: FfiConverterOptionString.read(from: &buf),telemetry: FfiConverterOptionTypeAppTelemetryInput.read(from: &buf),agents: FfiConverterOptionSequenceTypeAppAgentSettingsRow.read(from: &buf),agentsBusy: FfiConverterBool.read(from: &buf),agentsPending: FfiConverterSequenceString.read(from: &buf),teams: FfiConverterOptionTypeAppTeamsInput.read(from: &buf),- billing: FfiConverterOptionTypeAppBillingStatus.read(from: &buf),loginItem: FfiConverterOptionTypeAppLoginItemInput.read(from: &buf),experiments: FfiConverterTypeAppExperiments.read(from: &buf),keyvaultAutoWipe: FfiConverterOptionBool.read(from: &buf),@@ -32925,14 +32532,11 @@ public struct FfiConverterTypeAppSettingsInput: FfiConverterRustBuffer {FfiConverterTypeAppSignInPhase.write(value.signIn, into: &buf)FfiConverterBool.write(value.canSignOut, into: &buf)FfiConverterBool.write(value.menuBar, into: &buf)- FfiConverterTypeAppLocation.write(value.defaultLocation, into: &buf)- FfiConverterOptionString.write(value.locationLockedBy, into: &buf)FfiConverterOptionTypeAppTelemetryInput.write(value.telemetry, into: &buf)FfiConverterOptionSequenceTypeAppAgentSettingsRow.write(value.agents, into: &buf)FfiConverterBool.write(value.agentsBusy, into: &buf)FfiConverterSequenceString.write(value.agentsPending, into: &buf)FfiConverterOptionTypeAppTeamsInput.write(value.teams, into: &buf)- FfiConverterOptionTypeAppBillingStatus.write(value.billing, into: &buf)FfiConverterOptionTypeAppLoginItemInput.write(value.loginItem, into: &buf)FfiConverterTypeAppExperiments.write(value.experiments, into: &buf)FfiConverterOptionBool.write(value.keyvaultAutoWipe, into: &buf)@@ -34378,7 +33982,7 @@ public func FfiConverterTypeAppSidebarRow_lower(_ value: AppSidebarRow) -> RustBpublic struct AppSidebarSection: Equatable, Hashable {/**- * "Cua Cloud", "This Mac", "Connected", "My computers"+ * "This Mac", "Connected", "My computers"* (`spaces.sidebar.section.*`).*/public var title: AppMsg@@ -34391,7 +33995,7 @@ public struct AppSidebarSection: Equatable, Hashable {// declare one manually.public init(/**- * "Cua Cloud", "This Mac", "Connected", "My computers"+ * "This Mac", "Connected", "My computers"* (`spaces.sidebar.section.*`).*/title: AppMsg,/**@@ -34706,7 +34310,7 @@ public struct AppSignInFooterInput: Equatable, Hashable {*/public var identity: String?/**- * Cua Cloud works through client credentials (an API key).+ * The Cua account works through client credentials (an API key).*/public var cloudConfigured: Bool/**@@ -34729,7 +34333,7 @@ public struct AppSignInFooterInput: Equatable, Hashable {* The signed-in account.*/identity: String?,/**- * Cua Cloud works through client credentials (an API key).+ * The Cua account works through client credentials (an API key).*/cloudConfigured: Bool,/*** Signing in is possible here.@@ -34895,10 +34499,6 @@ public struct AppSpace: Equatable, Hashable {* Placeholder scene.*/public var scene: AppThumbnailScene- /**- * Group (cloud namespace or location word).- */- public var fleetId: String?/*** Fixture machine size.*/@@ -35003,9 +34603,6 @@ public struct AppSpace: Equatable, Hashable {/*** Placeholder scene.*/scene: AppThumbnailScene,- /**- * Group (cloud namespace or location word).- */fleetId: String?,/*** Fixture machine size.*/size: String?,@@ -35073,7 +34670,6 @@ public struct AppSpace: Equatable, Hashable {self.lastUsedAt = lastUsedAtself.startedAt = startedAtself.scene = scene- self.fleetId = fleetIdself.size = sizeself.region = regionself.provider = provider@@ -35117,7 +34713,6 @@ public struct FfiConverterTypeAppSpace: FfiConverterRustBuffer {lastUsedAt: FfiConverterInt64.read(from: &buf),startedAt: FfiConverterOptionInt64.read(from: &buf),scene: FfiConverterTypeAppThumbnailScene.read(from: &buf),- fleetId: FfiConverterOptionString.read(from: &buf),size: FfiConverterOptionString.read(from: &buf),region: FfiConverterOptionString.read(from: &buf),provider: FfiConverterOptionTypeAppSpaceProvider.read(from: &buf),@@ -35147,7 +34742,6 @@ public struct FfiConverterTypeAppSpace: FfiConverterRustBuffer {FfiConverterInt64.write(value.lastUsedAt, into: &buf)FfiConverterOptionInt64.write(value.startedAt, into: &buf)FfiConverterTypeAppThumbnailScene.write(value.scene, into: &buf)- FfiConverterOptionString.write(value.fleetId, into: &buf)FfiConverterOptionString.write(value.size, into: &buf)FfiConverterOptionString.write(value.region, into: &buf)FfiConverterOptionTypeAppSpaceProvider.write(value.provider, into: &buf)@@ -35369,11 +34963,6 @@ public struct AppSpaceDetail: Equatable, Hashable {* The sections under the facts, in order (Stream, Agents, Teleport).*/public var sections: [String]- /**- * A cloud Space refused for want of credit: one line and "Add- * credit" (the website billing page).- */- public var creditNotice: AppCreditNotice?/*** Why turning it off or on failed, shown inline under the preview.*/@@ -35443,10 +35032,6 @@ public struct AppSpaceDetail: Equatable, Hashable {/*** The sections under the facts, in order (Stream, Agents, Teleport).*/sections: [String],- /**- * A cloud Space refused for want of credit: one line and "Add- * credit" (the website billing page).- */creditNotice: AppCreditNotice?,/*** Why turning it off or on failed, shown inline under the preview.*/powerError: String?,@@ -35478,7 +35063,6 @@ public struct AppSpaceDetail: Equatable, Hashable {self.actions = actionsself.confirm = confirmself.sections = sections- self.creditNotice = creditNoticeself.powerError = powerErrorself.access = accessself.desktopNote = desktopNote@@ -35515,7 +35099,6 @@ public struct FfiConverterTypeAppSpaceDetail: FfiConverterRustBuffer {actions: FfiConverterSequenceTypeAppDetailAction.read(from: &buf),confirm: FfiConverterTypeAppDeleteConfirm.read(from: &buf),sections: FfiConverterSequenceString.read(from: &buf),- creditNotice: FfiConverterOptionTypeAppCreditNotice.read(from: &buf),powerError: FfiConverterOptionString.read(from: &buf),access: FfiConverterOptionTypeAppMachineAccessNotice.read(from: &buf),desktopNote: FfiConverterOptionString.read(from: &buf),@@ -35538,7 +35121,6 @@ public struct FfiConverterTypeAppSpaceDetail: FfiConverterRustBuffer {FfiConverterSequenceTypeAppDetailAction.write(value.actions, into: &buf)FfiConverterTypeAppDeleteConfirm.write(value.confirm, into: &buf)FfiConverterSequenceString.write(value.sections, into: &buf)- FfiConverterOptionTypeAppCreditNotice.write(value.creditNotice, into: &buf)FfiConverterOptionString.write(value.powerError, into: &buf)FfiConverterOptionTypeAppMachineAccessNotice.write(value.access, into: &buf)FfiConverterOptionString.write(value.desktopNote, into: &buf)@@ -35803,11 +35385,6 @@ public struct AppSpaceProgress: Equatable, Hashable {* Why the create failed.*/public var error: String?- /**- * It failed because the account is out of Cua Cloud credit: the- * website billing page "Add credit" opens.- */- public var creditUrl: String?/*** While it downloads: "4.2 of 22.1 GB · 85 MB/s · about 4 min"* ([`crate::spaces::creating::transfer_text`]).@@ -35848,10 +35425,6 @@ public struct AppSpaceProgress: Equatable, Hashable {/*** Why the create failed.*/error: String?,- /**- * It failed because the account is out of Cua Cloud credit: the- * website billing page "Add credit" opens.- */creditUrl: String?,/*** While it downloads: "4.2 of 22.1 GB · 85 MB/s · about 4 min"* ([`crate::spaces::creating::transfer_text`]).@@ -35875,7 +35448,6 @@ public struct AppSpaceProgress: Equatable, Hashable {self.permille = permilleself.label = labelself.error = error- self.creditUrl = creditUrlself.transfer = transferself.cancellable = cancellableself.cancelling = cancelling@@ -35903,7 +35475,6 @@ public struct FfiConverterTypeAppSpaceProgress: FfiConverterRustBuffer {permille: FfiConverterUInt32.read(from: &buf),label: FfiConverterString.read(from: &buf),error: FfiConverterOptionString.read(from: &buf),- creditUrl: FfiConverterOptionString.read(from: &buf),transfer: FfiConverterOptionString.read(from: &buf),cancellable: FfiConverterBool.read(from: &buf),cancelling: FfiConverterBool.read(from: &buf),@@ -35917,7 +35488,6 @@ public struct FfiConverterTypeAppSpaceProgress: FfiConverterRustBuffer {FfiConverterUInt32.write(value.permille, into: &buf)FfiConverterString.write(value.label, into: &buf)FfiConverterOptionString.write(value.error, into: &buf)- FfiConverterOptionString.write(value.creditUrl, into: &buf)FfiConverterOptionString.write(value.transfer, into: &buf)FfiConverterBool.write(value.cancellable, into: &buf)FfiConverterBool.write(value.cancelling, into: &buf)@@ -39745,10 +39315,6 @@ public struct AppWizardEnv: Equatable, Hashable {* Where "Run on" starts (Settings, `cua config set default.on`).*/public var defaultLocation: AppLocation- /**- * Signed in (or client credentials).- */- public var cloudAvailable: Bool/*** A local container backend or Lume exists.*/@@ -39790,10 +39356,6 @@ public struct AppWizardEnv: Equatable, Hashable {* when known.*/public var storage: AppLocalStorage?- /**- * This account's Cua Cloud rates, when known (no estimate without).- */- public var cloudPricing: AppCloudPricing?/*** The user's connected clouds (`cloud_status`), for "Your cloud"* (offered only while its experiment is on: [`offered_clouds`]).@@ -39826,9 +39388,6 @@ public struct AppWizardEnv: Equatable, Hashable {/*** Where "Run on" starts (Settings, `cua config set default.on`).*/defaultLocation: AppLocation,- /**- * Signed in (or client credentials).- */cloudAvailable: Bool,/*** A local container backend or Lume exists.*/localAvailable: Bool,@@ -39861,9 +39420,6 @@ public struct AppWizardEnv: Equatable, Hashable {* Free space and pulled images here (the SDK's `Local.storage()`),* when known.*/storage: AppLocalStorage?,- /**- * This account's Cua Cloud rates, when known (no estimate without).- */cloudPricing: AppCloudPricing?,/*** The user's connected clouds (`cloud_status`), for "Your cloud"* (offered only while its experiment is on: [`offered_clouds`]).@@ -39885,7 +39441,6 @@ public struct AppWizardEnv: Equatable, Hashable {* (the wasm build) is given one; tests give a fixed one.*/nameSeed: UInt64?) {self.defaultLocation = defaultLocation- self.cloudAvailable = cloudAvailableself.localAvailable = localAvailableself.localReason = localReasonself.localBackends = localBackends@@ -39895,7 +39450,6 @@ public struct AppWizardEnv: Equatable, Hashable {self.lumeSource = lumeSourceself.linuxSource = linuxSourceself.storage = storage- self.cloudPricing = cloudPricingself.clouds = cloudsself.hosts = hostsself.experiments = experiments@@ -39920,7 +39474,6 @@ public struct FfiConverterTypeAppWizardEnv: FfiConverterRustBuffer {returntry AppWizardEnv(defaultLocation: FfiConverterTypeAppLocation.read(from: &buf),- cloudAvailable: FfiConverterBool.read(from: &buf),localAvailable: FfiConverterBool.read(from: &buf),localReason: FfiConverterOptionString.read(from: &buf),localBackends: FfiConverterOptionSequenceString.read(from: &buf),@@ -39930,7 +39483,6 @@ public struct FfiConverterTypeAppWizardEnv: FfiConverterRustBuffer {lumeSource: FfiConverterOptionString.read(from: &buf),linuxSource: FfiConverterOptionString.read(from: &buf),storage: FfiConverterOptionTypeAppLocalStorage.read(from: &buf),- cloudPricing: FfiConverterOptionTypeAppCloudPricing.read(from: &buf),clouds: FfiConverterSequenceTypeAppConnectedCloud.read(from: &buf),hosts: FfiConverterSequenceTypeAppSpaceHost.read(from: &buf),experiments: FfiConverterTypeAppExperiments.read(from: &buf),@@ -39941,7 +39493,6 @@ public struct FfiConverterTypeAppWizardEnv: FfiConverterRustBuffer {public static func write(_ value: AppWizardEnv, into buf: inout [UInt8]) {FfiConverterTypeAppLocation.write(value.defaultLocation, into: &buf)- FfiConverterBool.write(value.cloudAvailable, into: &buf)FfiConverterBool.write(value.localAvailable, into: &buf)FfiConverterOptionString.write(value.localReason, into: &buf)FfiConverterOptionSequenceString.write(value.localBackends, into: &buf)@@ -39951,7 +39502,6 @@ public struct FfiConverterTypeAppWizardEnv: FfiConverterRustBuffer {FfiConverterOptionString.write(value.lumeSource, into: &buf)FfiConverterOptionString.write(value.linuxSource, into: &buf)FfiConverterOptionTypeAppLocalStorage.write(value.storage, into: &buf)- FfiConverterOptionTypeAppCloudPricing.write(value.cloudPricing, into: &buf)FfiConverterSequenceTypeAppConnectedCloud.write(value.clouds, into: &buf)FfiConverterSequenceTypeAppSpaceHost.write(value.hosts, into: &buf)FfiConverterTypeAppExperiments.write(value.experiments, into: &buf)@@ -49996,79 +49546,6 @@ public func FfiConverterTypeAppCloudConnectRequest_lower(_ value: AppCloudConnec}-// Note that we don't yet support `indirect` for enums.-// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.--public enum AppCloudEngine: Equatable, Hashable {-- /**- * gVisor containers.- */- case gvisor- /**- * KubeVirt VMs.- */- case kubevirt------}--#if compiler(>=6)-extension AppCloudEngine: Sendable {}-#endif--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public struct FfiConverterTypeAppCloudEngine: FfiConverterRustBuffer {- typealias SwiftType = AppCloudEngine-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> AppCloudEngine {- let variant: Int32 = try readInt(&buf)- switch variant {-- case 1: return .gvisor-- case 2: return .kubevirt-- default: throw UniffiInternalError.unexpectedEnumCase- }- }-- public static func write(_ value: AppCloudEngine, into buf: inout [UInt8]) {- switch value {--- case .gvisor:- writeInt(&buf, Int32(1))--- case .kubevirt:- writeInt(&buf, Int32(2))-- }- }-}---#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppCloudEngine_lift(_ buf: RustBuffer) throws -> AppCloudEngine {- return try FfiConverterTypeAppCloudEngine.lift(buf)-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-public func FfiConverterTypeAppCloudEngine_lower(_ value: AppCloudEngine) -> RustBuffer {- return FfiConverterTypeAppCloudEngine.lower(value)-}--// Note that we don't yet support `indirect` for enums.// See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.@@ -53282,11 +52759,6 @@ public func FfiConverterTypeAppLocalNetworkStepKind_lower(_ value: AppLocalNetwopublic enum AppLocation: Equatable, Hashable {- /**- * Cua Cloud (the SDK's `on="cloud"`). The apps do not offer it for new- * Spaces ([`CLOUD_SPACES_OFFERED`]); existing cloud Spaces still list.- */- case cloud/*** This Mac.*/@@ -53331,15 +52803,13 @@ public struct FfiConverterTypeAppLocation: FfiConverterRustBuffer {let variant: Int32 = try readInt(&buf)switch variant {- case 1: return .cloud-- case 2: return .local+ case 1: return .local- case 3: return .yours+ case 2: return .yours- case 4: return .host+ case 3: return .host- case 5: return .auto+ case 4: return .autodefault: throw UniffiInternalError.unexpectedEnumCase}@@ -53349,24 +52819,20 @@ public struct FfiConverterTypeAppLocation: FfiConverterRustBuffer {switch value {- case .cloud:- writeInt(&buf, Int32(1))--case .local:- writeInt(&buf, Int32(2))+ writeInt(&buf, Int32(1))case .yours:- writeInt(&buf, Int32(3))+ writeInt(&buf, Int32(2))case .host:- writeInt(&buf, Int32(4))+ writeInt(&buf, Int32(3))case .auto:- writeInt(&buf, Int32(5))+ writeInt(&buf, Int32(4))}}@@ -56973,10 +56439,6 @@ public enum AppRuntime: Equatable, Hashable {* Lume.*/case lume- /**- * KubeVirt.- */- case kubevirt/*** An external runtime provider installed on this machine, by its name* (the `<name>` of its `cua-runtime-<name>` executable).@@ -57014,9 +56476,7 @@ public struct FfiConverterTypeAppRuntime: FfiConverterRustBuffer {case 5: return .lume- case 6: return .kubevirt-- case 7: return .other(try FfiConverterString.read(from: &buf)+ case 6: return .other(try FfiConverterString.read(from: &buf))default: throw UniffiInternalError.unexpectedEnumCase@@ -57047,12 +56507,8 @@ public struct FfiConverterTypeAppRuntime: FfiConverterRustBuffer {writeInt(&buf, Int32(5))- case .kubevirt:- writeInt(&buf, Int32(6))--case let .other(v1):- writeInt(&buf, Int32(7))+ writeInt(&buf, Int32(6))FfiConverterString.write(v1, into: &buf)}@@ -58148,10 +57604,6 @@ public func FfiConverterTypeAppSpaceOs_lower(_ value: AppSpaceOs) -> RustBufferpublic enum AppSpaceProvider: Equatable, Hashable {- /**- * Cua Cloud.- */- case cloud/*** This Mac.*/@@ -58185,13 +57637,11 @@ public struct FfiConverterTypeAppSpaceProvider: FfiConverterRustBuffer {let variant: Int32 = try readInt(&buf)switch variant {- case 1: return .cloud-- case 2: return .local+ case 1: return .local- case 3: return .direct+ case 2: return .direct- case 4: return .relay+ case 3: return .relaydefault: throw UniffiInternalError.unexpectedEnumCase}@@ -58201,20 +57651,16 @@ public struct FfiConverterTypeAppSpaceProvider: FfiConverterRustBuffer {switch value {- case .cloud:- writeInt(&buf, Int32(1))--case .local:- writeInt(&buf, Int32(2))+ writeInt(&buf, Int32(1))case .direct:- writeInt(&buf, Int32(3))+ writeInt(&buf, Int32(2))case .relay:- writeInt(&buf, Int32(4))+ writeInt(&buf, Int32(3))}}@@ -60670,7 +60116,7 @@ public enum AppWindowMode: Equatable, Hashable {*/case ambientTeleportcase switcher- case createFleet+ case createSpace@@ -60698,7 +60144,7 @@ public struct FfiConverterTypeAppWindowMode: FfiConverterRustBuffer {case 3: return .switcher- case 4: return .createFleet+ case 4: return .createSpacedefault: throw UniffiInternalError.unexpectedEnumCase}@@ -60720,7 +60166,7 @@ public struct FfiConverterTypeAppWindowMode: FfiConverterRustBuffer {writeInt(&buf, Int32(3))- case .createFleet:+ case .createSpace:writeInt(&buf, Int32(4))}@@ -63977,78 +63423,6 @@ fileprivate struct FfiConverterOptionTypeAppApproveRequest: FfiConverterRustBuff}}-#if swift(>=5.8)-@_documentation(visibility: private)-#endif-fileprivate struct FfiConverterOptionTypeAppBillingCard: FfiConverterRustBuffer {- typealias SwiftType = AppBillingCard?-- public static func write(_ value: SwiftType, into buf: inout [UInt8]) {- guard let value = value else {- writeInt(&buf, Int8(0))- return- }- writeInt(&buf, Int8(1))- FfiConverterTypeAppBillingCard.write(value, into: &buf)- }-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {- switch try readInt(&buf) as Int8 {- case 0: return nil- case 1: return try FfiConverterTypeAppBillingCard.read(from: &buf)- default: throw UniffiInternalError.unexpectedOptionalTag- }- }-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-fileprivate struct FfiConverterOptionTypeAppBillingCredit: FfiConverterRustBuffer {- typealias SwiftType = AppBillingCredit?-- public static func write(_ value: SwiftType, into buf: inout [UInt8]) {- guard let value = value else {- writeInt(&buf, Int8(0))- return- }- writeInt(&buf, Int8(1))- FfiConverterTypeAppBillingCredit.write(value, into: &buf)- }-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {- switch try readInt(&buf) as Int8 {- case 0: return nil- case 1: return try FfiConverterTypeAppBillingCredit.read(from: &buf)- default: throw UniffiInternalError.unexpectedOptionalTag- }- }-}--#if swift(>=5.8)-@_documentation(visibility: private)-#endif-fileprivate struct FfiConverterOptionTypeAppBillingStatus: FfiConverterRustBuffer {- typealias SwiftType = AppBillingStatus?-- public static func write(_ value: SwiftType, into buf: inout [UInt8]) {- guard let value = value else {- writeInt(&buf, Int8(0))- return- }- writeInt(&buf, Int8(1))- FfiConverterTypeAppBillingStatus.write(value, into: &buf)- }-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {- switch try readInt(&buf) as Int8 {- case 0: return nil- case 1: return try FfiConverterTypeAppBillingStatus.read(from: &buf)- default: throw UniffiInternalError.unexpectedOptionalTag- }- }-}-#if swift(>=5.8)@_documentation(visibility: private)#endif@@ -64121,30 +63495,6 @@ fileprivate struct FfiConverterOptionTypeAppCloudField: FfiConverterRustBuffer {}}-#if swift(>=5.8)-@_documentation(visibility: private)-#endif-fileprivate struct FfiConverterOptionTypeAppCloudPricing: FfiConverterRustBuffer {- typealias SwiftType = AppCloudPricing?-- public static func write(_ value: SwiftType, into buf: inout [UInt8]) {- guard let value = value else {- writeInt(&buf, Int8(0))- return- }- writeInt(&buf, Int8(1))- FfiConverterTypeAppCloudPricing.write(value, into: &buf)- }-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {- switch try readInt(&buf) as Int8 {- case 0: return nil- case 1: return try FfiConverterTypeAppCloudPricing.read(from: &buf)- default: throw UniffiInternalError.unexpectedOptionalTag- }- }-}-#if swift(>=5.8)@_documentation(visibility: private)#endif@@ -64169,30 +63519,6 @@ fileprivate struct FfiConverterOptionTypeAppCreateFix: FfiConverterRustBuffer {}}-#if swift(>=5.8)-@_documentation(visibility: private)-#endif-fileprivate struct FfiConverterOptionTypeAppCreditNotice: FfiConverterRustBuffer {- typealias SwiftType = AppCreditNotice?-- public static func write(_ value: SwiftType, into buf: inout [UInt8]) {- guard let value = value else {- writeInt(&buf, Int8(0))- return- }- writeInt(&buf, Int8(1))- FfiConverterTypeAppCreditNotice.write(value, into: &buf)- }-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {- switch try readInt(&buf) as Int8 {- case 0: return nil- case 1: return try FfiConverterTypeAppCreditNotice.read(from: &buf)- default: throw UniffiInternalError.unexpectedOptionalTag- }- }-}-#if swift(>=5.8)@_documentation(visibility: private)#endif@@ -66305,30 +65631,6 @@ fileprivate struct FfiConverterOptionTypeAppCloudConnectRequest: FfiConverterRus}}-#if swift(>=5.8)-@_documentation(visibility: private)-#endif-fileprivate struct FfiConverterOptionTypeAppCloudEngine: FfiConverterRustBuffer {- typealias SwiftType = AppCloudEngine?-- public static func write(_ value: SwiftType, into buf: inout [UInt8]) {- guard let value = value else {- writeInt(&buf, Int8(0))- return- }- writeInt(&buf, Int8(1))- FfiConverterTypeAppCloudEngine.write(value, into: &buf)- }-- public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {- switch try readInt(&buf) as Int8 {- case 0: return nil- case 1: return try FfiConverterTypeAppCloudEngine.read(from: &buf)- default: throw UniffiInternalError.unexpectedOptionalTag- }- }-}-#if swift(>=5.8)@_documentation(visibility: private)#endifdiff --git a/libs/spaces-notch-swift/Tests/CuaSpacesNotchTests/Fixtures/host-messages.jsonl b/libs/spaces-notch-swift/Tests/CuaSpacesNotchTests/Fixtures/host-messages.jsonlindex 4c5b216f8d..44bb447431 100644--- a/libs/spaces-notch-swift/Tests/CuaSpacesNotchTests/Fixtures/host-messages.jsonl+++ b/libs/spaces-notch-swift/Tests/CuaSpacesNotchTests/Fixtures/host-messages.jsonl@@ -1,5 +1,5 @@{"type":"hello","v":1,"motion":{"hoverDwellMs":300,"closeDelayMs":400,"openResponse":0.42,"openDamping":0.8,"closeResponse":0.45,"closeDamping":1,"reducedDuration":0.2,"hoverResponse":0.26,"hoverDamping":0.65,"hoverScale":1.08,"hoverScaleY":1.12,"contentDelayMs":90,"contentIn":0.22,"contentOut":0.12,"contentScale":0.96},"radii":{"closed":{"top":6,"bottom":14},"open":{"top":19,"bottom":24}}}-{"type":"state","view":{"phase":"tiles","tiles":[{"id":"local:aurora","name":"aurora","status":"running","dim":false,"dropTarget":true,"targeted":true,"symbol":"apple","label":"aurora, running on This Mac","location":"This Mac","signedIn":true},{"id":"cloud:build","name":"build","status":"provisioning","dim":true,"dropTarget":false,"targeted":false,"symbol":"ubuntu","label":"build, starting","location":"Cua Cloud","progress":420,"progressLabel":"Starting","signedIn":false}],"dropMode":true,"prompt":"Drop on a Space","label":"Cua Spaces, 2 Spaces","countLabel":"2 Spaces","tab":{"count":"2","word":"Spaces"},"header":{"query":"au","placeholder":"Search Spaces","searchLabel":"Search Spaces","matchCount":1,"buttons":[{"id":"list","symbol":"list.bullet","label":"Spaces","help":"Show all Spaces"},{"id":"settings","symbol":"gearshape","label":"Settings","help":"Settings"}]},"activity":{"kind":"transfer","label":"Sending 1 file","permille":600,"startedAt":1767225600000,"estimateMs":8000},"hidden":false,"showTab":true,"hoverCue":false,"permission":{"text":"Allow Accessibility to drag windows here","action":"Open Settings","pane":"accessibility"},"access":{"text":"github.com live in aurora","dismiss":"Dismiss"}},"query":"au","layout":{"hasNotch":true,"notch":{"x":660,"y":950,"width":192,"height":32},"closedFrame":{"x":640,"y":940,"width":232,"height":42},"openFrame":{"x":436,"y":746,"width":640,"height":236},"promptFrame":{"x":641,"y":922,"width":230,"height":60},"tabFrame":{"x":852,"y":950,"width":44,"height":32},"tabInsetNotch":0,"tabInsetOuter":2,"stageFrame":{"x":416,"y":686,"width":680,"height":296},"notchStyle":true},"shown":true,"dragging":true,"icons":{"apple":{"symbol":"apple.logo"},"ubuntu":{"svg":"<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><circle cx=\"8\" cy=\"8\" r=\"7\"/></svg>"}},"highlight":"tile=local:aurora:pressed"}+{"type":"state","view":{"phase":"tiles","tiles":[{"id":"local:aurora","name":"aurora","status":"running","dim":false,"dropTarget":true,"targeted":true,"symbol":"apple","label":"aurora, running on This Mac","location":"This Mac","signedIn":true},{"id":"cloud:build","name":"build","status":"provisioning","dim":true,"dropTarget":false,"targeted":false,"symbol":"ubuntu","label":"build, starting","location":"This Mac","progress":420,"progressLabel":"Starting","signedIn":false}],"dropMode":true,"prompt":"Drop on a Space","label":"Cua Spaces, 2 Spaces","countLabel":"2 Spaces","tab":{"count":"2","word":"Spaces"},"header":{"query":"au","placeholder":"Search Spaces","searchLabel":"Search Spaces","matchCount":1,"buttons":[{"id":"list","symbol":"list.bullet","label":"Spaces","help":"Show all Spaces"},{"id":"settings","symbol":"gearshape","label":"Settings","help":"Settings"}]},"activity":{"kind":"transfer","label":"Sending 1 file","permille":600,"startedAt":1767225600000,"estimateMs":8000},"hidden":false,"showTab":true,"hoverCue":false,"permission":{"text":"Allow Accessibility to drag windows here","action":"Open Settings","pane":"accessibility"},"access":{"text":"github.com live in aurora","dismiss":"Dismiss"}},"query":"au","layout":{"hasNotch":true,"notch":{"x":660,"y":950,"width":192,"height":32},"closedFrame":{"x":640,"y":940,"width":232,"height":42},"openFrame":{"x":436,"y":746,"width":640,"height":236},"promptFrame":{"x":641,"y":922,"width":230,"height":60},"tabFrame":{"x":852,"y":950,"width":44,"height":32},"tabInsetNotch":0,"tabInsetOuter":2,"stageFrame":{"x":416,"y":686,"width":680,"height":296},"notchStyle":true},"shown":true,"dragging":true,"icons":{"apple":{"symbol":"apple.logo"},"ubuntu":{"svg":"<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 16 16\"><circle cx=\"8\" cy=\"8\" r=\"7\"/></svg>"}},"highlight":"tile=local:aurora:pressed"}{"type":"thumbnail","id":"local:aurora","image":"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="}{"type":"thumbnail","id":"cloud:build"}{"type":"ghost"}