@@ -540,12 +540,15 @@ export const makeServerLayer = Layer.unwrap(
             // On reboot this races NIC/DNS bring-up, so back off exponentially
             // (capped at 30s) instead of burning all retries in a second.
             // Bounded overall so a permanently broken setup still surfaces the
-            // warning below. Bad-request/unauthorized are deterministic local
-            // failures that no amount of retrying converges.
+            // warning below. Bad-request/unauthorized/conflict are
+            // deterministic failures (malformed origin, not linked yet, linked
+            // to a different cloud account) that no amount of retrying
+            // converges.
             Effect.retry({
               while: (error) =>
                 error._tag !== "EnvironmentHttpBadRequestError" &&
-                error._tag !== "EnvironmentHttpUnauthorizedError",
+                error._tag !== "EnvironmentHttpUnauthorizedError" &&
+                error._tag !== "EnvironmentHttpConflictError",
               schedule: Schedule.exponential("1 second").pipe(
                 Schedule.modifyDelay(({ duration }) =>
                   Effect.succeed(Duration.min(duration, Duration.seconds(30))),
 
@@ -45,14 +45,8 @@ import * as ManagedEndpointAllocations from "./ManagedEndpointAllocations.ts";
 import * as RelayConfiguration from "../Config.ts";
 import { isManagedEndpointHostname } from "../deploymentConfig.ts";
 
-// The reason set is part of the public relay contract so clients can render
-// specific diagnostics (e.g. "your server never linked" vs. a real auth issue).
-export const EnvironmentConnectNotAuthorizedReason = RelayEnvironmentConnectNotAuthorizedReason;
-export type EnvironmentConnectNotAuthorizedReason =
-  typeof EnvironmentConnectNotAuthorizedReason.Type;
-
 function environmentConnectNotAuthorizedReasonMessage(
-  reason: EnvironmentConnectNotAuthorizedReason,
+  reason: RelayEnvironmentConnectNotAuthorizedReason,
 ): string {
   switch (reason) {
     case "client_proof_key_thumbprint_missing":
@@ -79,7 +73,7 @@ export class EnvironmentConnectNotAuthorized extends Schema.TaggedErrorClass<Env
   {
     environmentId: Schema.String,
     operation: Schema.Literals(["connect", "status"]),
-    reason: EnvironmentConnectNotAuthorizedReason,
+    reason: RelayEnvironmentConnectNotAuthorizedReason,
   },
 ) {
   override get message(): string {