diff --git a/packages/app/src/app/host-runtime-bootstrap.test.ts b/packages/app/src/app/host-runtime-bootstrap.test.ts index 5eaf48288..64d0f013d 100644 --- a/packages/app/src/app/host-runtime-bootstrap.test.ts +++ b/packages/app/src/app/host-runtime-bootstrap.test.ts @@ -279,23 +279,14 @@ describe("resolveStartupRoute", () => { ).toEqual({ kind: "redirect", href: "/h/srv-desktop" }); }); - it("keeps root startup on the splash while a saved host reconnects", () => { - expect( - resolveStartupRoute({ - ...baseIndexInput, - hosts: [{ serverId: "server-saved" }], - }), - ).toEqual({ kind: "splash" }); - }); - - it("shows welcome after root startup gives up waiting for a saved offline host", () => { + it("keeps a known connecting host in app-owned routing instead of showing welcome", () => { expect( resolveStartupRoute({ ...baseIndexInput, hosts: [{ serverId: "server-saved" }], hasGivenUpWaitingForHost: true, }), - ).toEqual({ kind: "redirect", href: "/welcome" }); + ).toEqual({ kind: "redirect", href: "/h/server-saved" }); }); it("shows welcome after root startup gives up and no host exists", () => { diff --git a/packages/app/src/app/host-runtime-bootstrap.ts b/packages/app/src/app/host-runtime-bootstrap.ts index 49f745bde..8db0043fc 100644 --- a/packages/app/src/app/host-runtime-bootstrap.ts +++ b/packages/app/src/app/host-runtime-bootstrap.ts @@ -183,11 +183,9 @@ function resolveReadyIndexStartupRoute(input: ResolveIndexStartupRouteInput): St return { kind: "redirect", href: buildHostRootRoute(input.anyOnlineHostServerId) }; } - if (workspaceSelection) { - const fallbackServerId = input.hosts[0]?.serverId ?? null; - if (fallbackServerId) { - return { kind: "redirect", href: buildHostRootRoute(fallbackServerId) }; - } + const savedHostServerId = input.hosts[0]?.serverId ?? null; + if (savedHostServerId) { + return { kind: "redirect", href: buildHostRootRoute(savedHostServerId) }; } if (input.hasGivenUpWaitingForHost) {