Skip to content

armgit / cua

Public Imported from GitHub
0

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

feat(spaces): add a machine by address from New Space's arrow, system order, short Disk (#6208)

ddupont0e2a7b0f7d3c
diff --git a/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi.ts b/apps/cua-spaces-desktop/src/native/generated/cua_spaces_ffi.ts
index d99d98c058..5798e67f85 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
@@ -46316,7 +46316,7 @@ const FfiConverterTypeAppWizardFact = (() => {
export type AppWizardField = {
/**
* `os`, `image`, `placement`, `kind`, `runtime`, `connect-cloud`,
- * `connect-by-address`, `cpus`, `memory`, `disk`, `name`,
+ * `cpus`, `memory`, `disk`, `name`,
* `open-when-ready`, `address`, `token`, `address-name`.
*/
id: string,
diff --git a/apps/cua-spaces-web/e2e/new-space-split.spec.ts b/apps/cua-spaces-web/e2e/new-space-split.spec.ts
new file mode 100644
index 0000000000..92209c3786
--- /dev/null
+++ b/apps/cua-spaces-web/e2e/new-space-split.spec.ts
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+/**
+ * New Space's arrow: "Add a machine by its address" opens the address form
+ * (it does not use the image picker), and Run on has no such entry.
+ */
+
+import { expect, test } from "./host";
+
+test("New Space's arrow adds a machine by its address", async ({ page }) => {
+ await page.goto("/spaces?bridge=demo&parity");
+ const more = page.locator("[data-new-space-more]");
+ await more.waitFor();
+ await more.click();
+ const item = page.getByRole("menuitem", { name: "Add a machine by its address…" });
+ await expect(item).toBeVisible();
+ await item.click();
+ const wizard = page.locator("[data-new-space]");
+ await expect(wizard).toHaveAttribute("data-mode", "address");
+ await expect(wizard.locator("[data-image-input]")).toHaveCount(0);
+ await expect(wizard.locator("[data-run-on]")).toHaveCount(0);
+ // Back returns to the wizard's steps.
+ await wizard.locator("[data-wizard-back]").click();
+ await expect(wizard).toHaveAttribute("data-mode", "create");
+ await wizard.locator("[data-run-on]").click();
+ const values = await page.locator("[data-run-on-option]:visible").evaluateAll((els) => els.map((el) => el.getAttribute("data-value") ?? ""));
+ expect(values.some((v) => v.includes("address"))).toBe(false);
+});
diff --git a/apps/cua-spaces-web/e2e/new-space.ts b/apps/cua-spaces-web/e2e/new-space.ts
index 0fe5e350f5..627dd3c98b 100644
--- a/apps/cua-spaces-web/e2e/new-space.ts
+++ b/apps/cua-spaces-web/e2e/new-space.ts
@@ -20,7 +20,9 @@ import type { ParityCheckpoint } from "../src/bridge/parity";
const texts = (l: Locator) => l.evaluateAll((els) => els.map((el) => (el.textContent ?? "").replace(/\s+/g, " ").trim()));
const attrs = (l: Locator, name: string) => l.evaluateAll((els, n) => els.map((el) => el.getAttribute(n) ?? ""), name);
-const LINKS = new Set(["connect-cloud", "connect-by-address"]);
+/** Fields the page does not draw as a row: "Add your cloud account" is the last entry of Run on. */
+const LINKS = new Set(["connect-cloud"]);
+const ADD_CLOUD = { id: "add:cloud", label: "Add your cloud account\u2026" };
async function expectCheckbox(box: Locator, on: boolean, enabled = true): Promise<void> {
await expect(box).toHaveAttribute("aria-checked", String(on));
@@ -52,11 +54,13 @@ async function expectTiles(root: Locator, id: string, tiles: WizardView["osTiles
async function expectRunOnMenu(page: Page, v: WizardView): Promise<void> {
await page.locator("[data-run-on]").click();
const items = page.locator("[data-run-on-option]:visible");
- await expect(items).toHaveCount(v.placements.length);
- expect(await attrs(items, "data-value")).toEqual(v.placements.map((o) => o.id));
- expect(await items.evaluateAll((els) => els.map((el) => el.hasAttribute("data-disabled")))).toEqual(v.placements.map((o) => !o.enabled));
+ // Only with the Your cloud experiment (the core's `connect-cloud` field), last, after a rule.
+ const entries = [...v.placements.map((o) => ({ id: o.id, label: o.label, enabled: o.enabled })), ...(v.fields.some((f) => f.id === "connect-cloud") ? [{ ...ADD_CLOUD, enabled: true }] : [])];
+ await expect(items).toHaveCount(entries.length);
+ expect(await attrs(items, "data-value")).toEqual(entries.map((o) => o.id));
+ expect(await items.evaluateAll((els) => els.map((el) => el.hasAttribute("data-disabled")))).toEqual(entries.map((o) => !o.enabled));
const labels = await items.evaluateAll((els) => els.map((el) => el.querySelector("[data-item-label]")?.textContent ?? ""));
- expect(labels).toEqual(v.placements.map((o) => o.label));
+ expect(labels).toEqual(entries.map((o) => o.label));
await page.keyboard.press("Escape");
await expect(items).toHaveCount(0);
}
@@ -97,7 +101,7 @@ async function checkWizard(page: Page, state: WizardState, v: WizardView, menuCh
const field = (id: string) => shown.find((f) => f.id === id);
if (v.step === 0) {
- expect((await attrs(root.locator("[data-field]"), "data-field")).sort()).toEqual(shown.map((f) => f.id).sort());
+ expect((await attrs(root.locator("[data-field]"), "data-field")).sort()).toEqual(shown.filter((f) => !LINKS.has(f.id)).map((f) => f.id).sort());
const errors: Record<string, string> = {};
for (const f of shown) {
if (f.id === "image") {
diff --git a/apps/cua-spaces-web/src/__tests__/new-space-split.test.tsx b/apps/cua-spaces-web/src/__tests__/new-space-split.test.tsx
new file mode 100644
index 0000000000..db0cae43e0
--- /dev/null
+++ b/apps/cua-spaces-web/src/__tests__/new-space-split.test.tsx
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+// New Space's arrow: the second way to add, a machine by its address. It
+// opens the address form (no image picker), and Run on no longer lists it.
+
+import { cleanup, fireEvent, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { wasmBuilt } from "@/bridge/__tests__/testCore";
+import { resetNewSpaceSession } from "@/bridge/new-space";
+import { mountApp, stubBrowserApis } from "./app-harness";
+
+beforeEach(resetNewSpaceSession);
+afterEach(cleanup);
+stubBrowserApis();
+
+describe.skipIf(!wasmBuilt)("New Space split button", () => {
+ it("opens the address form from the arrow's menu, and the wizard from the button", { timeout: 20_000 }, async () => {
+ await mountApp("/spaces", { failsCreates: false, listsGhost: false });
+ fireEvent.click((await screen.findAllByRole("button", { name: "More ways to add" }))[0]!);
+ const item = await screen.findByRole("menuitem", { name: "Add a machine by its address…" });
+ fireEvent.click(item);
+ const dialog = await waitFor(() => {
+ const d = document.querySelector<HTMLElement>("[data-new-space]");
+ expect(d).not.toBeNull();
+ return d!;
+ });
+ await waitFor(() => expect(dialog.getAttribute("data-mode")).toBe("address"));
+ expect(dialog.querySelector("[data-image-input]")).toBeNull();
+ expect(dialog.querySelector("[data-run-on]")).toBeNull();
+ });
+
+ it("Run on has no address entry", { timeout: 20_000 }, async () => {
+ await mountApp("/spaces", { failsCreates: false, listsGhost: false });
+ fireEvent.click((await screen.findAllByRole("button", { name: /^New Space$/ }))[0]!);
+ const dialog = await waitFor(() => {
+ const d = document.querySelector<HTMLElement>("[data-new-space]");
+ expect(d).not.toBeNull();
+ return d!;
+ });
+ fireEvent.click(await waitFor(() => dialog.querySelector<HTMLElement>("[data-run-on]")!));
+ const values = await waitFor(() => {
+ const v = [...document.querySelectorAll("[data-run-on-option]")].map((el) => el.getAttribute("data-value"));
+ expect(v.length).toBeGreaterThan(0);
+ return v;
+ });
+ expect(values.some((v) => v?.includes("address"))).toBe(false);
+ });
+});
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.tsx
index 2ce3e16f9f..e213d24337 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
@@ -264,11 +264,11 @@ describe.skipIf(!wasmBuilt)("New Space (wasm core)", () => {
expect(hooks.connect.view!.fields.map((f) => [f.id, f.value])).toEqual([["place", "us-west-2"], ["budget", "200"], ["size", "4x16"]]);
});
- it("Connect by address adds the Space, and says why when it can't", async () => {
+ it("Add a machine by its address (New Space's arrow) adds the Space, and says why when it can't", async () => {
const { hooks } = mount(await testCore());
await waitFor(() => expect(hooks.spaces.data).toHaveLength(9));
- act(() => hooks.wizard.show());
- act(() => hooks.wizard.send({ type: "show-address" }));
+ // New Space's arrow opens the address form directly.
+ act(() => hooks.wizard.showAddress());
expect(hooks.wizard.view!.mode).toBe("address");
act(() => hooks.wizard.send({ type: "set-address", url: "studio.local" }));
await act(() => hooks.wizard.submitAddress());
diff --git a/apps/cua-spaces-web/src/bridge/new-space-hooks.ts b/apps/cua-spaces-web/src/bridge/new-space-hooks.ts
index 6d3b714cc7..ddfe8286b1 100644
--- a/apps/cua-spaces-web/src/bridge/new-space-hooks.ts
+++ b/apps/cua-spaces-web/src/bridge/new-space-hooks.ts
@@ -70,6 +70,8 @@ export interface NewSpaceWizardHook {
/** Opens the wizard; `on` presets "Run on" (`host:<machine>`, a cloud);
* `os` opens it on that system, on this machine (an empty home tile). */
show(on?: string | null, os?: SpaceOs): void;
+ /** Opens "Add a machine by its address" (New Space's menu): the address form, not the wizard's steps. */
+ showAddress(): void;
close(): void;
send(action: WizardAction): void;
/** Starts the plan's create through the bridge's creates flow and closes:
@@ -112,6 +114,12 @@ export function useNewSpaceWizard(): NewSpaceWizardHook {
update((x) => ({ ...x, open: true, pinnedEnv: null, state, placeOn: on ?? null }));
void ctx.ready.then(loadHostData);
},
+ showAddress() {
+ if (!offered) return;
+ const state = wizardReduce(core, wizardInitial(core, env), { type: "show-address" }, env);
+ update((x) => ({ ...x, open: true, pinnedEnv: null, state, placeOn: null }));
+ void ctx.ready.then(loadHostData);
+ },
close: () => update((x) => ({ ...x, open: false, state: null, pinnedEnv: null, placeOn: null })),
send,
create() {
diff --git a/apps/cua-spaces-web/src/components/new-space/new-space-button.tsx b/apps/cua-spaces-web/src/components/new-space/new-space-button.tsx
new file mode 100644
index 0000000000..94c1d4d268
--- /dev/null
+++ b/apps/cua-spaces-web/src/components/new-space/new-space-button.tsx
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: FSL-1.1-MIT
+// Copyright (c) 2026 Cua AI, Inc.
+
+import { ChevronDownIcon, PlusIcon } from "lucide-react";
+
+import { useNewSpaceWizard } from "@/bridge";
+import { Button } from "@/components/ui/button";
+import { Menu } from "@/components/ui/menu";
+import { useNewSpace } from "@/hooks/use-new-space";
+
+/**
+ * "New Space", with an arrow for the other way to add something to run on:
+ * a machine by its address (it does not use the image picker). Where the
+ * wizard cannot run (the host keeps New Space native), the button stands alone.
+ */
+export function NewSpaceButton() {
+ const newSpace = useNewSpace();
+ const wizard = useNewSpaceWizard();
+ if (!wizard.offered) {
+ return (
+ <Button onClick={newSpace}>
+ <PlusIcon /> New Space
+ </Button>
+ );
+ }
+ return (
+ <div className="inline-flex" data-new-space-split="">
+ <Button
+ onClick={newSpace}
+ className="rounded-r-none" // design-ok: the two halves of one split button
+ >
+ <PlusIcon /> New Space
+ </Button>
+ <Menu
+ trigger={
+ <Button
+ aria-label="More ways to add"
+ title="More ways to add"
+ data-new-space-more=""
+ className="w-7 rounded-l-none border-l-primary-foreground/25 px-0" // design-ok: the two halves of one split button
+ >
+ <ChevronDownIcon className="size-3.5" />
+ </Button>
+ }
+ items={[{ label: "Add a machine by its address\u2026", onSelect: () => wizard.showAddress() }]}
+ />
+ </div>
+ );
+}
diff --git a/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx b/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx
index 3502902b04..57d9b15e1e 100644
--- a/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx
+++ b/apps/cua-spaces-web/src/components/new-space/new-space-dialog.tsx
@@ -261,7 +261,8 @@ const labelOf = (v: WizardView, id: string) => fieldOf(v, id)?.label ?? "";
/* ---- System ---------------------------------------------------------------- */
-const LINKS = new Set(["connect-cloud", "connect-by-address"]);
+// "Add your cloud account" is the last entry of Run on, not a row of its own.
+const LINKS = new Set(["connect-cloud"]);
function SystemStep({ v }: { v: WizardView }) {
const { send } = useNewSpaceWizard();
@@ -270,7 +271,6 @@ function SystemStep({ v }: { v: WizardView }) {
const advanced = v.fields.filter((f) => f.advanced);
const rest = firstAdvanced < 0 ? [] : v.fields.slice(firstAdvanced).filter((f) => !f.advanced);
const rows = (fields: WizardField[]) => fields.filter((f) => !LINKS.has(f.id));
- const links = [...main, ...rest].filter((f) => LINKS.has(f.id));
return (
<div className="space-y-4">
@@ -307,34 +307,15 @@ function SystemStep({ v }: { v: WizardView }) {
))}
</Group>
) : null}
- {links.length ? (
- <div className="flex flex-wrap gap-x-4 gap-y-1 px-1">
- {links.map((f) => (
- <LinkField key={f.id} field={f} />
- ))}
- </div>
- ) : null}
</div>
);
}
-function LinkField({ field }: { field: WizardField }) {
- const { send } = useNewSpaceWizard();
- const connect = useConnectCloud();
- return (
- <button
- type="button"
- data-field={field.id}
- onClick={() => (field.id === "connect-cloud" ? connect.show() : send({ type: "show-address" }))}
- className="text-[13px] text-brand-strong outline-none hover:underline focus-visible:underline"
- >
- {field.label}
- </button>
- );
-}
+const ADD_CLOUD = "add:cloud";
function SystemRow({ field: f, v }: { field: WizardField; v: WizardView }) {
const { send } = useNewSpaceWizard();
+ const connect = useConnectCloud();
const error = f.error ? <FieldError id={f.id}>{f.error}</FieldError> : null;
switch (f.id) {
case "os":
@@ -374,8 +355,12 @@ function SystemRow({ field: f, v }: { field: WizardField; v: WizardView }) {
aria-label={f.label}
dataName="run-on"
value={v.placementId}
- items={v.placements.map((o) => ({ value: o.id, label: o.label, detail: o.detail, disabled: !o.enabled, group: o.group }))}
- onValueChange={(on) => send({ type: "choose-placement", on })}
+ items={[
+ ...v.placements.map((o) => ({ value: o.id, label: o.label, detail: o.detail, disabled: !o.enabled, group: o.group })),
+ // Only with the Your cloud experiment (the core offers the field); it opens the connect sheet.
+ ...(v.fields.some((x) => x.id === "connect-cloud") ? [{ value: ADD_CLOUD, label: "Add your cloud account\u2026", detail: "AWS, Google Cloud, Hetzner and others", group: ADD_CLOUD }] : []),
+ ]}
+ onValueChange={(on) => (on === ADD_CLOUD ? connect.show() : send({ type: "choose-placement", on }))}
/>
</Row>
);
diff --git a/apps/cua-spaces-web/src/routes/spaces/index.tsx b/apps/cua-spaces-web/src/routes/spaces/index.tsx
index 937e6ca6a8..e651b6b1c0 100644
--- a/apps/cua-spaces-web/src/routes/spaces/index.tsx
+++ b/apps/cua-spaces-web/src/routes/spaces/index.tsx
@@ -23,6 +23,7 @@ import { SpacesToolbar } from "@/components/spaces/spaces-toolbar";
import { PageTip, useTipsLoaded } from "@/components/tips";
import { useNewSpace } from "@/hooks/use-new-space";
import { useQuiet } from "@/hooks/use-quiet";
+import { NewSpaceButton } from "@/components/new-space/new-space-button";
import { Button } from "@/components/ui/button";
import { toastError } from "@/components/ui/toast";
import { thisComputerText } from "@/lib/host-labels";
@@ -152,9 +153,7 @@ function SpacesPage() {
title="Spaces"
description={isLoading || !listStatus.loaded ? "Loading Spaces…" : `${plural(counted.length, "Space")} on ${plural(machines.length, "machine")}, ${running} running`}
actions={
- <Button onClick={newSpace}>
- <PlusIcon /> New Space
- </Button>
+ <NewSpaceButton />
}
/>
{settled ? (
diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
index 6477e88012..ad1d474078 100644
--- a/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
+++ b/apps/cua-spaces/src/components/desktop/MainWindow.test.tsx
@@ -121,12 +121,21 @@ describe("MainWindow", () => {
expect(screen.queryByRole("dialog", { name: "New Space" })).toBeNull();
});
+ it("New Space's arrow adds a machine by its address: the address form, not a Run on entry", async () => {
+ setup();
+ fireEvent.click(await screen.findByRole("button", { name: "More ways to add" }));
+ fireEvent.mouseDown(await screen.findByRole("menuitem", { name: "Add a machine by its address\u2026" }));
+ const dialog = await screen.findByRole("dialog", { name: "Connect by address" });
+ expect(within(dialog).getByPlaceholderText("10.0.0.5:3211")).toBeTruthy();
+ expect(within(dialog).queryByRole("combobox", { name: "Run on" })).toBeNull();
+ });
+
it("runs on this Mac, offers no cloud with Your cloud turned off, never Cua Cloud", async () => {
window.localStorage.setItem("cua.settings.experiments", JSON.stringify({ yourCloud: false }));
setup();
fireEvent.click(await screen.findByRole("button", { name: "New Space" }));
const dialog = await screen.findByRole("dialog", { name: "New Space" });
- expect(within(within(dialog).getByRole("combobox", { name: "Run on" })).getAllByRole("option").map((o) => o.textContent)).toEqual(["This Mac", "Add a computer by its address…"]);
+ expect(within(within(dialog).getByRole("combobox", { name: "Run on" })).getAllByRole("option").map((o) => o.textContent)).toEqual(["This Mac"]);
expect(within(dialog).queryByRole("option", { name: /Add your cloud account/ })).toBeNull();
expect(within(dialog).queryByText(/Cua Cloud/)).toBeNull();
window.localStorage.removeItem("cua.settings.experiments");
diff --git a/apps/cua-spaces/src/components/desktop/MainWindow.tsx b/apps/cua-spaces/src/components/desktop/MainWindow.tsx
index a10596fae1..c9c88efd60 100644
--- a/apps/cua-spaces/src/components/desktop/MainWindow.tsx
+++ b/apps/cua-spaces/src/components/desktop/MainWindow.tsx
@@ -235,7 +235,8 @@ export function MainWindow({
startView === 'this-machine' || startView === 'host-setup' ? THIS_MACHINE_ID : null
);
const [query, setQuery] = useState('');
- const [wizard, setWizard] = useState<boolean | 'linux' | 'macos'>(
+ const [newMenu, setNewMenu] = useState(false);
+ const [wizard, setWizard] = useState<boolean | 'linux' | 'macos' | 'address'>(
startView === 'new-space' || startView === 'new-space-resources'
);
useEffect(() => {
@@ -595,6 +596,38 @@ export function MainWindow({
>
<Sym name="plus" />
</button>
+ <span className="dw-split-more">
+ <button
+ type="button"
+ className="dw-icon-btn"
+ aria-label={t("spaces.main.new_more")}
+ aria-haspopup="menu"
+ aria-expanded={newMenu}
+ title={t("spaces.main.new_more")}
+ onClick={() => setNewMenu((o) => !o)}
+ onBlur={() => setNewMenu(false)}
+ onKeyDown={(event) => event.key === 'Escape' && setNewMenu(false)}
+ >
+ <Sym name="chevron.down" size={12} />
+ </button>
+ {newMenu && (
+ <div role="menu" className="dw-split-menu">
+ <button
+ type="button"
+ role="menuitem"
+ className="dw-split-item"
+ // Before the button's blur closes the menu.
+ onMouseDown={(event) => {
+ event.preventDefault();
+ setNewMenu(false);
+ setWizard('address');
+ }}
+ >
+ {t("spaces.wizard.add_address")}
+ </button>
+ </div>
+ )}
+ </span>
</div>
<div className="dw-sidebar-search">
<Sym name="magnifyingglass" size={14} />
@@ -943,8 +976,8 @@ export function MainWindow({
storage={live ? local?.storage : undefined}
gpus={live ? gpus : null}
onOpenExternal={(url) => void bridge.openExternal(url).catch(() => {})}
- startActions={startActions}
- quick={typeof wizard === 'string' ? wizard : undefined}
+ quick={typeof wizard === 'string' && wizard !== 'address' ? wizard : undefined}
+ startActions={wizard === 'address' ? [{ type: 'show-address' }] : startActions}
onCreate={startCreate}
onAddByAddress={async (url, token, name) => {
const id = await sync.addSpace(url, token, name);
diff --git a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx
index 32a5e5c2d4..2e2e76147e 100644
--- a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx
+++ b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.test.tsx
@@ -192,14 +192,14 @@ describe("New Space wizard", () => {
it("lists This Mac and your machines; your clouds and Connect a cloud unless Your cloud is off", () => {
const onConnectCloud = vi.fn();
renderWizard({ clouds: [AWS], hosts: [MINI, STUDIO], onConnectCloud, experiments: NO_CLOUD });
- expect(entries()).toEqual(["Auto", "This Mac", "Mac mini", "Studio (offline) (disabled)", "Add a computer by its address…"]);
+ expect(entries()).toEqual(["Auto", "This Mac", "Mac mini", "Studio (offline) (disabled)"]);
expect(runOnMenu()).toHaveValue("local");
expect(screen.queryByText(/Cua Cloud/)).toBeNull();
expect(screen.queryByText(/Add your cloud account/)).toBeNull();
expect(screen.queryByRole("button", { name: /Connect a cloud/ })).toBeNull();
cleanup();
renderWizard({ clouds: [AWS], hosts: [MINI, STUDIO], onConnectCloud, experiments: YOUR_CLOUD });
- expect(entries()).toEqual(["Auto", "This Mac", "Mac mini", "Studio (offline) (disabled)", "AWS \u00b7 us-west-2", "Add your cloud account…", "Add a computer by its address…"]);
+ expect(entries()).toEqual(["Auto", "This Mac", "Mac mini", "Studio (offline) (disabled)", "AWS \u00b7 us-west-2", "Add your cloud account…"]);
runOn("add:cloud");
expect(onConnectCloud).toHaveBeenCalled();
});
@@ -246,7 +246,9 @@ describe("New Space wizard", () => {
fireEvent.click(screen.getByRole("button", { name: "Back" }));
fireEvent.click(screen.getByRole("button", { name: "Back" }));
fireEvent.click(screen.getByRole("button", { name: "Back" }));
- runOn("add:address");
+ // The address form is New Space's arrow, not a Run on entry.
+ cleanup();
+ renderWizard({ startActions: [{ type: "show-address" }] });
expect(screen.queryByLabelText("Cost")).toBeNull();
expect(screen.queryByText(/Free/)).toBeNull();
});
@@ -398,8 +400,7 @@ describe("the Resources step", () => {
describe("Connect by address", () => {
it("adds host:port with a token and dismisses on success", async () => {
const onAddByAddress = vi.fn(async () => {});
- const { onCancel } = renderWizard({ onAddByAddress });
- runOn("add:address");
+ const { onCancel } = renderWizard({ onAddByAddress, startActions: [{ type: "show-address" }] });
expect(screen.getByRole("button", { name: "Add Space" })).toBeDisabled();
fireEvent.change(screen.getByPlaceholderText("10.0.0.5:3211"), {
target: { value: "127.0.0.1:3211" },
@@ -416,8 +417,7 @@ describe("Connect by address", () => {
const onAddByAddress = vi.fn(async () => {
throw new Error("cua-spacesd is not available at 127.0.0.1:1");
});
- const { onCancel } = renderWizard({ onAddByAddress });
- runOn("add:address");
+ const { onCancel } = renderWizard({ onAddByAddress, startActions: [{ type: "show-address" }] });
fireEvent.change(screen.getByPlaceholderText("10.0.0.5:3211"), {
target: { value: "127.0.0.1:1" },
});
diff --git a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx
index 335045b794..7d367ba1a3 100644
--- a/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx
+++ b/apps/cua-spaces/src/components/desktop/NewSpaceWizard.tsx
@@ -664,9 +664,8 @@ function InfoTip({ label, text }: { label: string; text: string }) {
);
}
-/** The "Run on" menu's last two entries: they open a flow instead of picking a place. */
+/** The "Run on" menu's last entry: it opens a flow instead of picking a place. */
const ADD_CLOUD = "add:cloud";
-const ADD_ADDRESS = "add:address";
/** One field of the System step, drawn by its core `id`. */
function SystemField({
@@ -717,7 +716,6 @@ function SystemField({
title={chosen?.detail || undefined}
onChange={(event) => {
if (event.target.value === ADD_CLOUD) onConnectCloud?.();
- else if (event.target.value === ADD_ADDRESS) dispatch({ type: "show-address" });
else dispatch({ type: "choose-placement", on: event.target.value });
}}
>
@@ -731,9 +729,6 @@ function SystemField({
{t("spaces.wizard.add_cloud")}
</option>
)}
- <option value={ADD_ADDRESS} title={t("spaces.wizard.add_address_hint")}>
- {t("spaces.wizard.add_address")}
- </option>
</select>
</label>
{f.error && (
@@ -783,9 +778,8 @@ function SystemField({
</select>
</label>
);
- // Reached from the "Run on" menu's last two entries, not drawn here.
+ // Reached from the "Run on" menu's last entry, not drawn here.
case "connect-cloud":
- case "connect-by-address":
return null;
default:
return null;
diff --git a/apps/cua-spaces/src/components/desktop/Sym.tsx b/apps/cua-spaces/src/components/desktop/Sym.tsx
index 97fb8b602a..b183defd46 100644
--- a/apps/cua-spaces/src/components/desktop/Sym.tsx
+++ b/apps/cua-spaces/src/components/desktop/Sym.tsx
@@ -9,6 +9,7 @@ import { SfIcon } from "../SfIcon";
*/
const PATHS: Record<string, string> = {
plus: "M12 5v14M5 12h14",
+ "chevron.down": "m6 9.5 6 6 6-6",
terminal: "M3.5 5h17v14h-17zM7.5 10l3 2.5-3 2.5M12.5 15.5h4",
magnifyingglass: "M10.5 17a6.5 6.5 0 1 0 0-13 6.5 6.5 0 0 0 0 13Zm4.7-1.8L20 20",
cloud: "M7 18h10a4 4 0 0 0 .5-7.97A5.5 5.5 0 0 0 6.6 9.1 4.5 4.5 0 0 0 7 18Z",
diff --git a/apps/cua-spaces/src/i18n/locales/en/spaces.json b/apps/cua-spaces/src/i18n/locales/en/spaces.json
index 338d78a28f..f45b10affe 100644
--- a/apps/cua-spaces/src/i18n/locales/en/spaces.json
+++ b/apps/cua-spaces/src/i18n/locales/en/spaces.json
@@ -41,8 +41,8 @@
"spaces.wizard.connect_by_address": "Connect by address",
"spaces.wizard.add_cloud": "Add your cloud account\u2026",
"spaces.wizard.add_cloud_hint": "AWS, Google Cloud, Hetzner and others",
- "spaces.wizard.add_address": "Add a computer by its address\u2026",
- "spaces.wizard.add_address_hint": "A computer you run yourself",
+ "spaces.wizard.add_address": "Add a machine by its address\u2026",
+ "spaces.main.new_more": "More ways to add",
"spaces.wizard.info_details": "{label} details",
"spaces.wizard.label": "New Space",
"spaces.wizard.steps_label": "Steps",
diff --git a/apps/cua-spaces/src/styles/desktop.css b/apps/cua-spaces/src/styles/desktop.css
index e22f5f238d..5cd1d58bba 100644
--- a/apps/cua-spaces/src/styles/desktop.css
+++ b/apps/cua-spaces/src/styles/desktop.css
@@ -3305,3 +3305,35 @@ html.is-teleport-picker .hp-panel {
color: var(--dw-danger);
font-size: 12px;
}
+
+/* New Space's arrow: the other way to add, a machine by its address. */
+.dw-split-more {
+ position: relative;
+ display: inline-flex;
+}
+.dw-split-menu {
+ position: absolute;
+ top: calc(100% + 4px);
+ left: 0;
+ z-index: 20;
+ min-width: 220px;
+ padding: 4px;
+ border: 1px solid var(--dw-border);
+ border-radius: var(--dw-radius);
+ background: var(--dw-surface);
+ box-shadow: var(--dw-shadow-sheet);
+}
+.dw-split-item {
+ display: block;
+ width: 100%;
+ padding: 4px 8px;
+ border: 0;
+ border-radius: 5px;
+ background: transparent;
+ color: var(--dw-text);
+ text-align: left;
+}
+.dw-split-item:hover {
+ background: var(--dw-accent);
+ color: #fff;
+}
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-gpu.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-gpu.json
index 55c22026dd..903d3177ee 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-gpu.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-gpu.json
@@ -18,8 +18,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -78,8 +77,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": "GPU acceleration (Experimental) [ ] Learn more -> https://cua.ai/docs/lume/guides/gpu-passthrough",
"image": "ghcr.io/trycua/macos:26",
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-microvm.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-microvm.json
index 8fb3f08ca5..cac830f5d5 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/create-microvm.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/create-microvm.json
@@ -18,8 +18,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -79,8 +78,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -140,8 +138,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/macos:26",
@@ -197,8 +194,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/macos:26",
@@ -254,8 +250,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -315,8 +310,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -375,8 +369,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
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.json
index e9ef9ae5f0..8719a714ee 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
@@ -18,8 +18,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -135,8 +134,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -196,8 +194,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04-slim",
@@ -313,8 +310,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04-slim",
@@ -374,8 +370,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04-disk",
@@ -1340,8 +1335,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04-disk",
@@ -1400,8 +1394,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/omarchy:edge",
@@ -1514,8 +1507,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/omarchy:edge",
@@ -1793,8 +1785,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/omarchy:edge",
@@ -1852,8 +1843,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022",
@@ -1911,8 +1901,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022",
@@ -1970,8 +1959,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022",
@@ -2029,8 +2017,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022",
@@ -2088,8 +2075,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/macos:26",
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.json
index b0c213d857..01694f73ce 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
@@ -18,8 +18,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -77,8 +76,7 @@
"placement: Run on !This Mac cannot run QEMU Spaces.",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022",
@@ -134,8 +132,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -193,8 +190,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -252,8 +248,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -311,8 +306,7 @@
"placement: Run on !This Mac cannot run QEMU Spaces.",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04-disk",
@@ -368,8 +362,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -427,8 +420,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -486,8 +478,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -552,8 +543,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -618,8 +608,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -684,8 +673,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -743,8 +731,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "win",
@@ -803,8 +790,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "win",
@@ -863,8 +849,7 @@
"placement: Run on !This Mac cannot run QEMU Spaces.",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022",
@@ -920,8 +905,7 @@
"placement: Run on !This Mac cannot run QEMU Spaces.",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/Acme/desktop",
@@ -976,8 +960,7 @@
"placement: Run on !This Mac cannot run QEMU Spaces.",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/acme/desktop:1.2 x",
@@ -1032,8 +1015,7 @@
"placement: Run on !This Mac cannot run QEMU Spaces.",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/windows:2022-disk",
@@ -1088,8 +1070,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/trycua/linux:24.04",
@@ -1152,8 +1133,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/acme/desktop:1.2",
@@ -1210,8 +1190,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/acme/desktop:1.2",
@@ -1484,8 +1463,7 @@
"placement: Run on",
"kind: Kind (advanced)",
"runtime: Runtime (advanced)",
- "connect-cloud: Connect a cloud…",
- "connect-by-address: Connect by address…"
+ "connect-cloud: Connect a cloud…"
],
"gpu": null,
"image": "ghcr.io/acme/desktop:1.2",
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json
index a32fb455bf..6681fc7659 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/experiments.json
@@ -105,8 +105,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -244,8 +243,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -381,8 +379,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -503,8 +500,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -625,8 +621,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -747,8 +742,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -874,8 +868,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -1003,8 +996,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
@@ -1132,8 +1124,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"placements": [
"auto | Auto | Least-loaded of your machines: this Mac or one of your machines that provides Spaces. | on",
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json
index 03cf3d6f8e..399dcaffcc 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/placement-picker.json
@@ -12,8 +12,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -64,8 +63,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -116,8 +114,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -168,8 +165,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -217,8 +213,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"container | Container | | off",
@@ -267,8 +262,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -316,8 +310,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -366,8 +359,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -418,8 +410,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"kindsOff": [
"vm | Virtual machine | AWS does not run this image. Ask your agent to deploy the Ubuntu 24.04 VM image on AWS and add it with cua spaces add. | off",
@@ -473,8 +464,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -525,8 +515,7 @@
"image",
"placement",
"kind",
- "runtime",
- "connect-by-address"
+ "runtime"
],
"kindsOff": [
"microvm | MicroVM | | off"
diff --git a/libs/cua/crates/cua-spaces-app-core/parity/golden/your-cloud.json b/libs/cua/crates/cua-spaces-app-core/parity/golden/your-cloud.json
index 8c6d98fb7f..8b55f4e890 100644
--- a/libs/cua/crates/cua-spaces-app-core/parity/golden/your-cloud.json
+++ b/libs/cua/crates/cua-spaces-app-core/parity/golden/your-cloud.json
@@ -13,8 +13,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -60,8 +59,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"kindsOff": [
"microvm | MicroVM | | off"
@@ -696,8 +694,7 @@
"placement",
"kind",
"runtime",
- "connect-cloud",
- "connect-by-address"
+ "connect-cloud"
],
"kindsOff": [
"vm | Virtual machine | VM Spaces need a nested-virtualization machine; not offered yet. Ask your agent to deploy the Ubuntu 24.04 VM image on AWS and add it with cua spaces add. | off",
diff --git a/libs/cua/crates/cua-spaces-app-core/src/wizard.rs b/libs/cua/crates/cua-spaces-app-core/src/wizard.rs
index 7e06590b0b..cd00c825fd 100644
--- a/libs/cua/crates/cua-spaces-app-core/src/wizard.rs
+++ b/libs/cua/crates/cua-spaces-app-core/src/wizard.rs
@@ -2798,7 +2798,7 @@ pub struct ImageFieldView {
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct WizardField {
/// `os`, `image`, `placement`, `kind`, `runtime`, `connect-cloud`,
- /// `connect-by-address`, `cpus`, `memory`, `disk`, `name`,
+ /// `cpus`, `memory`, `disk`, `name`,
/// `open-when-ready`, `address`, `token`, `address-name`.
pub id: String,
/// Label (or the link's title).
@@ -3085,7 +3085,6 @@ fn fields(
.your_cloud
.then(|| field("connect-cloud", CONNECT_CLOUD_LABEL)),
)
- .chain([field("connect-by-address", "Connect by address\u{2026}")])
.collect(),
// The cloud picks the machine: no sliders, its facts only.
(WizardMode::Create, 1) if yours => vec![],
@@ -6875,17 +6874,7 @@ mod tests {
let ids = |s: &WizardState| -> Vec<String> {
view(s, &e).fields.into_iter().map(|f| f.id).collect()
};
- assert_eq!(
- ids(&s),
- [
- "os",
- "image",
- "placement",
- "kind",
- "runtime",
- "connect-by-address"
- ]
- );
+ assert_eq!(ids(&s), ["os", "image", "placement", "kind", "runtime"]);
let s1 = reduce(&s, &WizardAction::Next, &e);
assert_eq!(
ids(&s1),
diff --git a/libs/cua/crates/cua-spaces-ffi/src/app_core_types.rs b/libs/cua/crates/cua-spaces-ffi/src/app_core_types.rs
index 8535a42730..83974ea33e 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
@@ -4043,7 +4043,7 @@ pub type AppWizardField = core::wizard::WizardField;
#[uniffi::remote(Record)]
pub struct AppWizardField {
/// `os`, `image`, `placement`, `kind`, `runtime`, `connect-cloud`,
- /// `connect-by-address`, `cpus`, `memory`, `disk`, `name`,
+ /// `cpus`, `memory`, `disk`, `name`,
/// `open-when-ready`, `address`, `token`, `address-name`.
pub id: String,
/// Label (or the link's title).
diff --git a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
index b2b00ad48a..9217cb6fa1 100644
--- a/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
+++ b/libs/spaces-app-swift/Sources/CuaSpacesFFI/CuaSpacesFFI.swift
@@ -44684,7 +44684,7 @@ public func FfiConverterTypeAppWizardFact_lower(_ value: AppWizardFact) -> RustB
public struct AppWizardField: Equatable, Hashable {
/**
* `os`, `image`, `placement`, `kind`, `runtime`, `connect-cloud`,
- * `connect-by-address`, `cpus`, `memory`, `disk`, `name`,
+ * `cpus`, `memory`, `disk`, `name`,
* `open-when-ready`, `address`, `token`, `address-name`.
*/
public var id: String
@@ -44710,7 +44710,7 @@ public struct AppWizardField: Equatable, Hashable {
public init(
/**
* `os`, `image`, `placement`, `kind`, `runtime`, `connect-cloud`,
- * `connect-by-address`, `cpus`, `memory`, `disk`, `name`,
+ * `cpus`, `memory`, `disk`, `name`,
* `open-when-ready`, `address`, `token`, `address-name`.
*/id: String,
/**