From 2a38d6fbf3217c3b2559cc6e318ac5503df1fec9 Mon Sep 17 00:00:00 2001
From: Alexey Volkov <alexey.volkov@shopify.com>
Date: Thu, 19 Mar 2026 02:27:48 -0700
Subject: [PATCH] Normalized the URL slashes

---
 packages/app/src/entry.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/entry.tsx b/packages/app/src/entry.tsx
index f62dc78b02..d08ccaf179 100644
--- a/packages/app/src/entry.tsx
+++ b/packages/app/src/entry.tsx
@@ -98,9 +98,10 @@ if (!(root instanceof HTMLElement) && import.meta.env.DEV) {
 }
 
 const getCurrentUrl = () => {
+  let serverBaseUrl = import.meta.env.VITE_OPENCODE_SERVER_BASE_URL ?? ""
+  // Normalizing slashes. Add starting slash if needed, remove trailing slash. Default value will be empty string.
+  serverBaseUrl = ("/" + serverBaseUrl.replace(/^\//, "")).replace(/\/$/, "")
   if (location.hostname.includes("opencode.ai")) return "http://localhost:4096"
-  const serverBaseUrl =
-    "/" + (import.meta.env.VITE_OPENCODE_SERVER_BASE_URL ?? "/").replace(/^\//, "").replace(/\/$/, "")
   if (import.meta.env.DEV)
     return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}{serverBaseUrl}`
   return location.origin + serverBaseUrl