From ace3721ef1ee9c8651e38fa7b2b9576941e30d5c Mon Sep 17 00:00:00 2001
From: Austin Jang <ajangg@amazon.com>
Date: Fri, 21 Nov 2025 12:16:20 -0800
Subject: [PATCH] fix: rearrange order for double unescape

---
 packages/core/src/awsService/sagemaker/model.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/awsService/sagemaker/model.ts b/packages/core/src/awsService/sagemaker/model.ts
index cd50d2ecd5d..95fd635c6b9 100644
--- a/packages/core/src/awsService/sagemaker/model.ts
+++ b/packages/core/src/awsService/sagemaker/model.ts
@@ -174,14 +174,14 @@ export async function prepareDevEnvConnection(
                   const logFileLocation = path.join(ctx.globalStorageUri.fsPath, 'hyperpod-connection.log')
                   const decodedWsUrl =
                       wsUrl
-                          ?.replace(/&amp;/g, '&')
-                          .replace(/&#39;/g, "'")
-                          .replace(/&quot;/g, '"') || ''
+                          ?.replace(/&#39;/g, "'")
+                          .replace(/&quot;/g, '"')
+                          .replace(/&amp;/g, '&') || ''
                   const decodedToken =
                       token
-                          ?.replace(/&amp;/g, '&')
-                          .replace(/&#39;/g, "'")
-                          .replace(/&quot;/g, '"') || ''
+                          ?.replace(/&#39;/g, "'")
+                          .replace(/&quot;/g, '"')
+                          .replace(/&amp;/g, '&') || ''
                   const region = decodedWsUrl ? extractRegionFromStreamUrl(decodedWsUrl) : ''
 
                   const hyperPodEnv: NodeJS.ProcessEnv = {