Fix removed host routes getting stuck connecting

packages/app/src/utils/host-routes.test.ts

@@ -16,6 +16,7 @@ import {
   parseHostWorkspaceOpenIntentFromPathname,
   parseHostWorkspaceRouteFromPathname,
   parseWorkspaceOpenIntent,
+  resolveKnownHostRoute,
 } from "./host-routes";
 
 describe("parseHostAgentRouteFromPathname", () => {
@@ -190,3 +191,32 @@ describe("host settings section slugs", () => {
     expect(normalizeHostSectionSlug("daemon")).toBe("host");
   });
 });
+
+describe("resolveKnownHostRoute", () => {
+  it("renders when the route host is still saved", () => {
+    expect(
+      resolveKnownHostRoute({
+        routeServerId: "srv-current",
+        hosts: [{ serverId: "srv-current" }, { serverId: "srv-next" }],
+      }),
+    ).toEqual({ kind: "render" });
+  });
+
+  it("sends removed host routes to the next saved host home", () => {
+    expect(
+      resolveKnownHostRoute({
+        routeServerId: "srv-removed",
+        hosts: [{ serverId: "srv-next" }],
+      }),
+    ).toEqual({ kind: "redirect", href: "/h/srv-next/open-project" });
+  });
+
+  it("sends host routes to welcome when no hosts are saved", () => {
+    expect(
+      resolveKnownHostRoute({
+        routeServerId: "srv-removed",
+        hosts: [],
+      }),
+    ).toEqual({ kind: "redirect", href: "/welcome" });
+  });
+});

packages/app/src/utils/host-routes.ts

@@ -355,6 +355,27 @@ export function buildHostOpenProjectRoute(serverId: string) {
   return `${base}/open-project` as const;
 }
 
+export type KnownHostRouteResolution =
+  | { kind: "render" }
+  | { kind: "redirect"; href: ReturnType<typeof buildHostOpenProjectRoute> | "/welcome" };
+
+export function resolveKnownHostRoute(input: {
+  routeServerId: string | null | undefined;
+  hosts: readonly { serverId: string }[];
+}): KnownHostRouteResolution {
+  const routeServerId = trimNonEmpty(input.routeServerId);
+  if (routeServerId && input.hosts.some((host) => host.serverId === routeServerId)) {
+    return { kind: "render" };
+  }
+
+  const fallbackServerId = input.hosts[0]?.serverId;
+  if (fallbackServerId) {
+    return { kind: "redirect", href: buildHostOpenProjectRoute(fallbackServerId) };
+  }
+
+  return { kind: "redirect", href: "/welcome" };
+}
+
 export function buildHostNewWorkspaceRoute(
   serverId: string,
   sourceDirectory?: string,