From f03beefc08ae17fcc5f7d034cdaf3d6c52bea2fc Mon Sep 17 00:00:00 2001
From: Kacper Wojciechowski <39823706+jog1t@users.noreply.github.com>
Date: Mon, 6 Oct 2025 17:29:22 +0200
Subject: [PATCH] fix: specify engine ns when connecting to railway

---
 .../data-providers/engine-data-provider.tsx   |  1 +
 .../src/app/dialogs/connect-railway-frame.tsx | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/data-providers/engine-data-provider.tsx b/frontend/src/app/data-providers/engine-data-provider.tsx
index 364e2b0c3c..b36246fd63 100644
--- a/frontend/src/app/data-providers/engine-data-provider.tsx
+++ b/frontend/src/app/data-providers/engine-data-provider.tsx
@@ -375,6 +375,7 @@ export const createNamespaceContext = ({
 	} satisfies DefaultDataProvider;
 
 	return {
+		engineNamespace: namespace,
 		...dataProvider,
 		runnersQueryOptions() {
 			return infiniteQueryOptions({
diff --git a/frontend/src/app/dialogs/connect-railway-frame.tsx b/frontend/src/app/dialogs/connect-railway-frame.tsx
index 888e9b078a..4e062a5866 100644
--- a/frontend/src/app/dialogs/connect-railway-frame.tsx
+++ b/frontend/src/app/dialogs/connect-railway-frame.tsx
@@ -97,6 +97,8 @@ function FormStepper({ onClose }: { onClose?: () => void }) {
 																		.VITE_APP_API_URL
 																: cloudEnv()
 																		.VITE_APP_CLOUD_ENGINE_URL
+														}&RIVET_NAMESPACE=${
+															dataProvider.engineNamespace
 														}`}
 														target="_blank"
 														rel="noreferrer"
@@ -167,27 +169,28 @@ function EnvVariablesStep() {
 	const { data, isLoading } = useQuery(
 		dataProvider.connectRunnerTokenQueryOptions(),
 	);
+
 	return (
 		<>
 			<p>
 				Set the following environment variables in your Railway project
 				settings.
 			</p>
-			<div className="gap-1 items-center">
+			<div className="gap-1 items-center grid grid-cols-2">
 				{__APP_TYPE__ === "engine" ? (
-					<div className="flex gap-1 items-center border-b border-b-border/40 pb-2 mb-2">
+					<>
 						<DiscreteInput value="RIVET_ENGINE" show />
 						<DiscreteInput value={engineEnv().VITE_APP_API_URL} />
-					</div>
+					</>
 				) : null}
-				<div className="flex gap-1 items-center">
-					<DiscreteInput value="RIVET_TOKEN" show />
-					{isLoading ? (
-						<Skeleton className="w-56 h-10" />
-					) : (
-						<DiscreteInput value={data || ""} />
-					)}
-				</div>
+				<DiscreteInput value="RIVET_TOKEN" show />
+				{isLoading ? (
+					<Skeleton className="w-56 h-10" />
+				) : (
+					<DiscreteInput value={data || ""} />
+				)}
+				<DiscreteInput value="RIVET_NAMESPACE" show />
+				<DiscreteInput value={dataProvider.engineNamespace} show />
 			</div>
 		</>
 	);