api: fix cwd computation for remotes

71 · Nov 19, 2023 · e9cd2ca · e9cd2ca
1 parent 715542d
commit e9cd2ca
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/src/api/run.ts b/src/api/run.ts
@@ -455,11 +455,31 @@ export function execute(
     cwd = function () {
       const currentFileUri = Context.currentOrUndefined?.document.uri;
 
-      return currentFileUri?.scheme === "file"
-        ? vscode.Uri.joinPath(currentFileUri, "..").fsPath
-        : vscode.workspace.workspaceFolders?.[0]?.uri.fsPath;
+      if (currentFileUri?.scheme === "file" || currentFileUri?.scheme === "vscode-userdata") {
+        return vscode.Uri.joinPath(currentFileUri, "..").fsPath;
+      }
+
+      const workspaceFolder = vscode.workspace.workspaceFolders?.[0]?.uri;
+
+      if (workspaceFolder?.scheme === "file") {
+        return workspaceFolder.fsPath;
+      }
+
+      return undefined;
+    }(),
+    env: givenEnv = function () {
+      if (vscode.env.remoteName !== undefined) {
+        return {};
+      }
+
+      const env = { ...process.env };
+
+      if (cwd !== undefined) {
+        env["PWD"] = cwd;
+      }
+
+      return env;
     }(),
-    env: givenEnv = process.env,
   } = options;
 
   if (process.platform as string === "web") {
@@ -480,15 +500,14 @@ export function execute(
             shell = typeof automationProfile?.path === "string" ? automationProfile.path : "",
             args = Array.isArray(automationProfile?.args) ? automationProfile!.args : [],
             env = {
-              ...(cwd == null ? {} : { PWD: cwd }),
               ...(typeof automationProfile?.env === "object" ? automationProfile.env : {}),
               ...givenEnv,
             },
             child = shell.length === 0
-              ? cp.spawn(command, { ...commonSpawnOptions, shell: true, env, cwd })
+              ? cp.spawn(command, { ...commonSpawnOptions, shell: true, env, cwd: env["PWD"] })
               : cp.spawn(shell,
                          [...args, command],
-                         { ...commonSpawnOptions, shell: false, env, cwd });
+                         { ...commonSpawnOptions, shell: false, env, cwd: env["PWD"] });
 
       let stdout = "",
           stderr = "";