Merge branch 'main' into copilot/fix-3b6de93e-8dce-49f5-8cd1-5f79d0da7ad8

Author: eleanorjboyd

src/features/execution/execUtils.ts

@@ -1,8 +1,14 @@
 export function quoteStringIfNecessary(arg: string): string {
-    if (arg.indexOf(' ') >= 0 && !(arg.startsWith('"') && arg.endsWith('"'))) {
-        return `"${arg}"`;
+    // Always return if already quoted to avoid double-quoting
+    if (arg.startsWith('"') && arg.endsWith('"')) {
+        return arg;
     }
-    return arg;
+
+    // Quote if contains common shell special characters that are problematic across multiple shells
+    // Includes: space, &, |, <, >, ;, ', ", `, (, ), [, ], {, }, $
+    const needsQuoting = /[\s&|<>;'"`()\[\]{}$]/.test(arg);
+
+    return needsQuoting ? `"${arg}"` : arg;
 }
 
 export function quoteArgs(args: string[]): string[] {

src/features/terminal/terminalEnvVarInjector.ts

@@ -110,7 +110,6 @@ export class TerminalEnvVarInjector implements Disposable {
                 await this.injectEnvironmentVariablesForWorkspace(workspaceFolder);
             } else {
                 // No provided workspace - update all workspaces
-                this.envVarCollection.clear();
 
                 const workspaceFolders = workspace.workspaceFolders;
                 if (!workspaceFolders || workspaceFolders.length === 0) {
@@ -140,7 +139,6 @@ export class TerminalEnvVarInjector implements Disposable {
 
             // use scoped environment variable collection
             const envVarScope = this.getEnvironmentVariableCollectionScoped({ workspaceFolder });
-            envVarScope.clear(); // Clear existing variables for this workspace
 
             // Check if env file injection is enabled
             const config = getConfiguration('python', workspaceUri);