fix(app): preserve active host connection choices (#2905)

Settings lost the workspace host when entering the app-wide route, while desktop bootstrap could restore a removed local connection before the saved registry was ready. Use the remembered workspace host for Settings and only register the managed daemon when its server is unknown after registry hydration.
2026-08-05 20:26:41 +02:00
parent 781274ed1a
commit 48bdc5610f
8 changed files with 193 additions and 32 deletions
@@ -0,0 +1,52 @@
+import { test } from "../support/fixtures";
+import { openSettings } from "../support/helpers/app";
+import { getE2EDaemonPort, wsRoutePatternForPort } from "../support/helpers/daemon-port";
+import { startIsolatedHostDaemon } from "../support/helpers/isolated-host-daemon";
+import {
+  addDirectHostFromSettings,
+  clickSettingsBackToWorkspace,
+  openSettingsHostSection,
+} from "../support/helpers/settings";
+import { seedWorkspace } from "../support/helpers/seed-client";
+import { switchWorkspaceViaSidebar } from "../support/helpers/workspace-ui";
+
+test.describe("Settings host selection", () => {
+  test.describe.configure({ timeout: 180_000 });
+
+  test("entering Settings from a remote workspace selects that remote host", async ({ page }) => {
+    const remoteDaemon = await startIsolatedHostDaemon("settings-host-selection-remote");
+    const remoteWorkspace = await seedWorkspace({
+      port: remoteDaemon.port,
+      repoPrefix: "settings-host-selection-remote-workspace-",
+      title: "Remote workspace",
+    });
+
+    try {
+      // The default local profile remains in the registry, but its daemon is offline.
+      await page.routeWebSocket(wsRoutePatternForPort(getE2EDaemonPort()), async (ws) => {
+        await ws.close({ code: 1008, reason: "The local daemon is disconnected." });
+      });
+
+      await page.goto("/");
+      await openSettings(page);
+      await addDirectHostFromSettings(page, {
+        host: "127.0.0.1",
+        port: remoteDaemon.port,
+      });
+
+      await clickSettingsBackToWorkspace(page);
+      await switchWorkspaceViaSidebar({
+        page,
+        serverId: remoteDaemon.serverId,
+        workspaceId: remoteWorkspace.workspaceId,
+      });
+
+      await openSettings(page);
+
+      await openSettingsHostSection(page, remoteDaemon.serverId, "connections");
+    } finally {
+      await remoteWorkspace.cleanup().catch(() => undefined);
+      await remoteDaemon.close().catch(() => undefined);
+    }
+  });
+});
@@ -86,6 +86,18 @@ export async function selectHostConnectionType(
  await page.getByRole("button", { name: label }).click();
 }

+export async function addDirectHostFromSettings(
+  page: Page,
+  input: { host: string; port: number },
+): Promise<void> {
+  await openAddHostFlow(page);
+  await selectHostConnectionType(page, "direct");
+  await page.getByTestId("direct-host-input").fill(input.host);
+  await page.getByTestId("direct-port-input").fill(String(input.port));
+  await page.getByTestId("direct-host-submit").click();
+  await expect(page.getByTestId("add-host-modal")).toHaveCount(0, { timeout: 30_000 });
+}
+
 export async function toggleHostAdvanced(page: Page): Promise<void> {
  await page.getByTestId("direct-host-advanced-toggle").click();
 }