fix(connect): Restore the pinned relay client before connecting

apps/server/src/cli/connect.test.ts

@@ -58,6 +58,7 @@ it.effect("does not install the relay client when the user declines the managed
     let installCalls = 0;
     const result = yield* acquireRelayClientForLink(
       {
+        prepare: Effect.die("link inspection must not prepare the relay client"),
         resolve: Effect.succeed({
           status: "missing",
           version: RelayClient.CLOUDFLARED_VERSION,
@@ -87,6 +88,7 @@ it.effect("installs the relay client after the user accepts the managed download
     const progress: Array<string> = [];
     const result = yield* acquireRelayClientForLink(
       {
+        prepare: Effect.die("link inspection must not prepare the relay client"),
         resolve: Effect.succeed({
           status: "missing",
           version: RelayClient.CLOUDFLARED_VERSION,
@@ -125,6 +127,7 @@ it.effect("reuses an available relay client executable without prompting", () =>
     let promptCalls = 0;
     const result = yield* acquireRelayClientForLink(
       {
+        prepare: Effect.die("link inspection must not prepare the relay client"),
         resolve: Effect.succeed(managedExecutable),
         install: Effect.die("unexpected install"),
         installWithProgress: () => Effect.die("unexpected install"),

apps/server/src/cloud/ManagedEndpointRuntime.test.ts

@@ -21,7 +21,8 @@ import * as ManagedEndpointRuntime from "./ManagedEndpointRuntime.ts";
 const layerRelayClientAvailable = Layer.succeed(
   RelayClient.RelayClient,
   RelayClient.RelayClient.of({
-    resolve: Effect.succeed({
+    resolve: Effect.die("launch must prepare the relay client"),
+    prepare: Effect.succeed({
       status: "available",
       executablePath: "cloudflared",
       source: "path",
@@ -341,7 +342,20 @@ describe("CloudManagedEndpointRuntime", () => {
           return handle;
         }),
       );
-      const runtime = yield* buildCloudManagedEndpointRuntime(spawner);
+      const relayClient = yield* RelayClient.RelayClient.pipe(
+        Effect.provide(layerRelayClientAvailable),
+      );
+      let preparations = 0;
+      const runtime = yield* buildCloudManagedEndpointRuntime(
+        spawner,
+        Layer.succeed(RelayClient.RelayClient, {
+          ...relayClient,
+          prepare: Effect.sync(() => {
+            expect(killed).toHaveLength(spawned.length);
+            preparations += 1;
+          }).pipe(Effect.andThen(relayClient.prepare)),
+        }),
+      );
 
       yield* runtime.applyConfig({
         providerKind: "cloudflare_tunnel",
@@ -377,6 +391,7 @@ describe("CloudManagedEndpointRuntime", () => {
       expect(spawned.map((command) => command.options.detached)).toEqual([false, false]);
       expect(spawned.map((command) => command.options.shell)).toEqual([false, false]);
       expect(killed).toEqual([100, 101]);
+      expect(preparations).toBe(2);
       expect(stopped).toEqual({ status: "disabled" });
     }),
   );
@@ -732,7 +747,8 @@ describe("CloudManagedEndpointRuntime", () => {
         Layer.succeed(
           RelayClient.RelayClient,
           RelayClient.RelayClient.of({
-            resolve: Effect.succeed({
+            resolve: Effect.die("launch must prepare the relay client"),
+            prepare: Effect.succeed({
               status: "missing",
               version: RelayClient.CLOUDFLARED_VERSION,
             }),

apps/server/src/cloud/ManagedEndpointRuntime.ts

@@ -298,7 +298,7 @@ export const make = Effect.gen(function* () {
 
     yield* stopActive;
 
-    const executable = yield* relayClient.resolve;
+    const executable = yield* relayClient.prepare;
     if (executable.status !== "available") {
       return {
         status: "failed",