Guard missing desktop bridge SSH cleanup

Author: mwolson

apps/web/src/environments/runtime/service.addSavedEnvironment.test.ts

@@ -773,6 +773,40 @@ describe("addSavedEnvironment", () => {
     await resetEnvironmentServiceForTests();
   });
 
+  it("removes a saved ssh environment when the desktop bridge is unavailable", async () => {
+    mockSavedRecords = [
+      {
+        environmentId: EnvironmentId.make("environment-1"),
+        label: "Remote environment",
+        httpBaseUrl: "http://127.0.0.1:3774/",
+        wsBaseUrl: "ws://127.0.0.1:3774/",
+        createdAt: "2026-04-14T00:00:00.000Z",
+        lastConnectedAt: null,
+        desktopSsh: {
+          alias: "devbox",
+          hostname: "devbox.example.com",
+          username: "julius",
+          port: 22,
+        },
+      },
+    ];
+    vi.stubGlobal("window", {});
+
+    const { removeSavedEnvironment, resetEnvironmentServiceForTests } = await import("./service");
+
+    await expect(removeSavedEnvironment(EnvironmentId.make("environment-1"))).resolves.toBe(
+      undefined,
+    );
+
+    expect(mockRemovePersistedSavedEnvironment).toHaveBeenCalledWith(
+      EnvironmentId.make("environment-1"),
+    );
+    expect(mockDisconnectSshEnvironment).not.toHaveBeenCalled();
+    expect(mockSavedRecords).toEqual([]);
+
+    await resetEnvironmentServiceForTests();
+  });
+
   it("disconnects a saved ssh environment without removing its saved record", async () => {
     mockSavedRecords = [
       {

apps/web/src/environments/runtime/service.ts

@@ -1684,7 +1684,7 @@ export async function removeSavedEnvironment(environmentId: EnvironmentId): Prom
   useStore.getState().removeEnvironmentState(environmentId);
 
   if (record?.desktopSsh && typeof window !== "undefined") {
-    void window.desktopBridge?.disconnectSshEnvironment(record.desktopSsh).catch((error) => {
+    void window.desktopBridge?.disconnectSshEnvironment(record.desktopSsh)?.catch((error) => {
       console.warn("[SAVED_ENVIRONMENTS] SSH cleanup after removal failed", error);
     });
   }