From 0289171bb94f6991db6a93c8dc1018d89ef512ea Mon Sep 17 00:00:00 2001
From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>
Date: Wed, 19 Feb 2025 15:21:44 -0800
Subject: [PATCH 1/2] fix bug with extension overriding debugpy endpoint

---
 bundled/scripts/noConfigScripts/debugpy | 1 +
 src/extension/noConfigDebugInit.ts      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bundled/scripts/noConfigScripts/debugpy b/bundled/scripts/noConfigScripts/debugpy
index 1893a2cd..def62ec5 100755
--- a/bundled/scripts/noConfigScripts/debugpy
+++ b/bundled/scripts/noConfigScripts/debugpy
@@ -1,3 +1,4 @@
 #! /bin/bash
 # Bash script
+export DEBUGPY_ADAPTER_ENDPOINTS=$VSCODE_DEBUGPY_ADAPTER_ENDPOINTS
 python3 $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $@
diff --git a/src/extension/noConfigDebugInit.ts b/src/extension/noConfigDebugInit.ts
index 55b185d5..840ea3ad 100644
--- a/src/extension/noConfigDebugInit.ts
+++ b/src/extension/noConfigDebugInit.ts
@@ -67,8 +67,8 @@ export async function registerNoConfigDebug(
     // Add env var for PYDEVD_DISABLE_FILE_VALIDATION to disable extra output in terminal when starting the debug session.
     collection.replace('PYDEVD_DISABLE_FILE_VALIDATION', '1');
 
-    // Add env vars for DEBUGPY_ADAPTER_ENDPOINTS, BUNDLED_DEBUGPY_PATH, and PATH
-    collection.replace('DEBUGPY_ADAPTER_ENDPOINTS', tempFilePath);
+    // Add env vars for VSCODE_DEBUGPY_ADAPTER_ENDPOINTS, BUNDLED_DEBUGPY_PATH, and PATH
+    collection.replace('VSCODE_DEBUGPY_ADAPTER_ENDPOINTS', tempFilePath);
 
     const noConfigScriptsDir = path.join(extPath, 'bundled', 'scripts', 'noConfigScripts');
     const pathSeparator = process.platform === 'win32' ? ';' : ':';

From b6487bd8d2e9f02ddfb180735b6a5fda9e71f611 Mon Sep 17 00:00:00 2001
From: eleanorjboyd <26030610+eleanorjboyd@users.noreply.github.com>
Date: Thu, 20 Feb 2025 11:41:44 -0800
Subject: [PATCH 2/2] update for all shell types

---
 bundled/scripts/noConfigScripts/debugpy.bat  | 1 +
 bundled/scripts/noConfigScripts/debugpy.fish | 1 +
 bundled/scripts/noConfigScripts/debugpy.ps1  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/bundled/scripts/noConfigScripts/debugpy.bat b/bundled/scripts/noConfigScripts/debugpy.bat
index 25e3bf5f..2450cf6a 100755
--- a/bundled/scripts/noConfigScripts/debugpy.bat
+++ b/bundled/scripts/noConfigScripts/debugpy.bat
@@ -1,3 +1,4 @@
 @echo off
 :: Bat script
+set DEBUGPY_ADAPTER_ENDPOINTS=%VSCODE_DEBUGPY_ADAPTER_ENDPOINTS%
 python %BUNDLED_DEBUGPY_PATH% --listen 0 --wait-for-client %*
diff --git a/bundled/scripts/noConfigScripts/debugpy.fish b/bundled/scripts/noConfigScripts/debugpy.fish
index 5206b078..624f7202 100755
--- a/bundled/scripts/noConfigScripts/debugpy.fish
+++ b/bundled/scripts/noConfigScripts/debugpy.fish
@@ -1,2 +1,3 @@
 # Fish script
+set -x DEBUGPY_ADAPTER_ENDPOINTS $VSCODE_DEBUGPY_ADAPTER_ENDPOINTS
 python3 $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $argv
diff --git a/bundled/scripts/noConfigScripts/debugpy.ps1 b/bundled/scripts/noConfigScripts/debugpy.ps1
index bf949d64..4b2ff85a 100755
--- a/bundled/scripts/noConfigScripts/debugpy.ps1
+++ b/bundled/scripts/noConfigScripts/debugpy.ps1
@@ -1,4 +1,5 @@
 # PowerShell script
+$env:DEBUGPY_ADAPTER_ENDPOINTS = $env:VSCODE_DEBUGPY_ADAPTER_ENDPOINTS
 $os = [System.Environment]::OSVersion.Platform
 if ($os -eq [System.PlatformID]::Win32NT) {
     python $env:BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $args