[VSC-1800] - OPENOCD_USB_ADAPTER_LOCATION not being cleared

src/espIdf/hints/index.ts

@@ -203,7 +203,7 @@ export class ErrorHintProvider
     let openOcdHintsPath: string | null = null;
     try {
       const openOCDManager = OpenOCDManager.init();
-      const openOCDVersion = await openOCDManager.version();
+      const openOCDVersion = await openOCDManager.version(true);
       if (toolsPath && openOCDVersion) {
         openOcdHintsPath = await getOpenOcdHintsYmlPath(
           toolsPath,

src/espIdf/hints/openocdhint.ts

@@ -70,7 +70,7 @@ export class OpenOCDErrorMonitor {
     try {
         // Check OpenOCD version first
         const openOCDManager = OpenOCDManager.init();
-        const version = await openOCDManager.version();
+        const version = await openOCDManager.version(true);
 
         if (!version) {
             Logger.info(

src/espIdf/openOcd/openOcdManager.ts

@@ -59,7 +59,7 @@ export class OpenOCDManager extends EventEmitter {
     this.configureServerWithDefaultParam();
   }
 
-  public async version(): Promise<string> {
+  public async version(silent: boolean = false): Promise<string> {
     const modifiedEnv = await appendIdfAndToolsToPath(this.workspace);
     const openOcdPath = await isBinInPath("openocd", modifiedEnv, [
       "openocd-esp32",
@@ -70,6 +70,7 @@ export class OpenOCDManager extends EventEmitter {
     const resp = await sspawn(openOcdPath, ["--version"], {
       cwd: this.workspace.fsPath,
       env: modifiedEnv,
+      silent,
     });
     const versionString = resp.toString();
     const match = versionString.match(/v\d+\.\d+\.\d+\-\S*/gi);

src/espIdf/setTarget/DevkitsCommand.ts

@@ -34,7 +34,7 @@ export class DevkitsCommand {
     this.workspaceRoot = workspaceRoot;
   }
 
-  public async runDevkitsScript(): Promise<string> {
+  public async runDevkitsScript(openOCDVersion: string): Promise<string> {
     try {
       const workspaceFolder = vscode.workspace.getWorkspaceFolder(
         this.workspaceRoot
@@ -47,8 +47,6 @@ export class DevkitsCommand {
         "idf.toolsPath",
         this.workspaceRoot
       ) as string;
-      const openOCDManager = OpenOCDManager.init();
-      const openOCDVersion = await openOCDManager.version();
 
       if (!toolsPath || !openOCDVersion) {
         throw new Error("Could not get toolsPath or OpenOCD version");
@@ -88,6 +86,10 @@ export class DevkitsCommand {
       const pythonBinPath = await getVirtualEnvPythonPath(this.workspaceRoot);
       const modifiedEnv = await appendIdfAndToolsToPath(this.workspaceRoot);
 
+      // Remove OPENOCD_USB_ADAPTER_LOCATION from environment during device detection
+      // to allow scanning all available devices, not just the one at the configured location
+      delete modifiedEnv.OPENOCD_USB_ADAPTER_LOCATION;
+
       OutputChannel.init();
       OutputChannel.appendLine(
         "Running ESP Detect Config...",
@@ -140,14 +142,12 @@ export class DevkitsCommand {
     }
   }
 
-  public async getScriptPath(): Promise<string | null> {
+  public async getScriptPath(openOCDVersion: string): Promise<string | null> {
     try {
       const toolsPath = idfConf.readParameter(
         "idf.toolsPath",
         this.workspaceRoot
       ) as string;
-      const openOCDManager = OpenOCDManager.init();
-      const openOCDVersion = await openOCDManager.version();
 
       if (!toolsPath || !openOCDVersion) {
         return null;

src/espIdf/setTarget/index.ts

@@ -34,6 +34,7 @@ import {
 import { Logger } from "../../logger/logger";
 import { OutputChannel } from "../../logger/outputChannel";
 import { selectOpenOcdConfigFiles } from "../openOcd/boardConfiguration";
+import { OpenOCDManager } from "../openOcd/openOcdManager";
 import { getTargetsFromEspIdf, IdfTarget } from "./getTargets";
 import { setTargetInIDF } from "./setTargetInIdf";
 import { updateCurrentProfileIdfTarget } from "../../project-conf";
@@ -95,11 +96,13 @@ export async function setIdfTarget(
 
         if (!isDebugging) {
           try {
+            const openOCDManager = OpenOCDManager.init();
+            const openOCDVersion = await openOCDManager.version();
             const devkitsCmd = new DevkitsCommand(workspaceFolder.uri);
-            const scriptPath = await devkitsCmd.getScriptPath();
+            const scriptPath = await devkitsCmd.getScriptPath(openOCDVersion);
 
             if (scriptPath) {
-              const devkitsOutput = await devkitsCmd.runDevkitsScript();
+              const devkitsOutput = await devkitsCmd.runDevkitsScript(openOCDVersion);
               if (devkitsOutput) {
                 const parsed = JSON.parse(devkitsOutput);
                 if (parsed && Array.isArray(parsed.boards)) {
@@ -160,6 +163,13 @@ export async function setIdfTarget(
         if (!selectedTarget) {
           return;
         }
+        // Create a plain object copy to avoid proxy issues when modifying/deleting properties
+        const customExtraVarsRead = readParameter(
+          "idf.customExtraVars",
+          workspaceFolder
+        ) as { [key: string]: string };
+        const customExtraVars = { ...customExtraVarsRead };
+
         if (selectedTarget.isConnected && selectedTarget.boardInfo) {
           // Directly set OpenOCD configs for connected board
           const configFiles = selectedTarget.boardInfo.config_files || [];
@@ -171,10 +181,6 @@ export async function setIdfTarget(
           );
           // Store USB location if available
           if (selectedTarget.boardInfo.location) {
-            const customExtraVars = readParameter(
-              "idf.customExtraVars",
-              workspaceFolder
-            ) as { [key: string]: string };
             const location = selectedTarget.boardInfo.location.replace(
               "usb://",
               ""
@@ -186,19 +192,32 @@ export async function setIdfTarget(
               configurationTarget,
               workspaceFolder.uri
             );
+          } else {
+            // Clear OPENOCD_USB_ADAPTER_LOCATION if no location is available
+            delete customExtraVars["OPENOCD_USB_ADAPTER_LOCATION"];
+            await writeParameter(
+              "idf.customExtraVars",
+              customExtraVars,
+              configurationTarget,
+              workspaceFolder.uri
+            );
           }
         } else {
+          // Clear OPENOCD_USB_ADAPTER_LOCATION when switching to non-connected target
+          delete customExtraVars["OPENOCD_USB_ADAPTER_LOCATION"];
+          await writeParameter(
+            "idf.customExtraVars",
+            customExtraVars,
+            configurationTarget,
+            workspaceFolder.uri
+          );
           await selectOpenOcdConfigFiles(
             workspaceFolder.uri,
             selectedTarget.idfTarget.target
           );
         }
 
         await setTargetInIDF(workspaceFolder, selectedTarget.idfTarget);
-        const customExtraVars = readParameter(
-          "idf.customExtraVars",
-          workspaceFolder
-        ) as { [key: string]: string };
         customExtraVars["IDF_TARGET"] = selectedTarget.idfTarget.target;
         await writeParameter(
           "idf.customExtraVars",