Refactor Node.js version upgrade workflow

Updated the Node.js version fetching and fallback logic to ensure valid versions are used and added error handling for missing versions.

.github/workflows/node-upgrade.yml

@@ -13,110 +13,93 @@ jobs:
       - name: Get latest Node versions
         id: node-versions
         run: |
-          # Get latest Node.js releases from official GitHub releases
+          set -e
           echo "Fetching latest Node.js releases..."
-
           # Get latest v20.x release
           LATEST_NODE20=$(curl -s https://api.github.com/repos/nodejs/node/releases | \
             jq -r '.[] | select(.tag_name | startswith("v20.")) | .tag_name' | \
             head -1 | sed 's/^v//')
-
           # Get latest v24.x release  
           LATEST_NODE24=$(curl -s https://api.github.com/repos/nodejs/node/releases | \
             jq -r '.[] | select(.tag_name | startswith("v24.")) | .tag_name' | \
             head -1 | sed 's/^v//')
-
           echo "Found Node.js releases: 20=$LATEST_NODE20, 24=$LATEST_NODE24"
-
           # Verify these versions are available in alpine_nodejs releases
           echo "Verifying availability in alpine_nodejs..."
           ALPINE_RELEASES=$(curl -s https://api.github.com/repos/actions/alpine_nodejs/releases | jq -r '.[].tag_name')
-
           if ! echo "$ALPINE_RELEASES" | grep -q "^node20-$LATEST_NODE20$"; then
             echo "::warning title=Node 20 Fallback::Node 20 version $LATEST_NODE20 not found in alpine_nodejs releases, using fallback"
-            # Fall back to latest available alpine_nodejs v20 release
             LATEST_NODE20=$(echo "$ALPINE_RELEASES" | grep "^node20-" | head -1 | sed 's/^node20-//')
             echo "Using latest available alpine_nodejs Node 20: $LATEST_NODE20"
           fi
-
           if ! echo "$ALPINE_RELEASES" | grep -q "^node24-$LATEST_NODE24$"; then
             echo "::warning title=Node 24 Fallback::Node 24 version $LATEST_NODE24 not found in alpine_nodejs releases, using fallback"
-            # Fall back to latest available alpine_nodejs v24 release
             LATEST_NODE24=$(echo "$ALPINE_RELEASES" | grep "^node24-" | head -1 | sed 's/^node24-//')
             echo "Using latest available alpine_nodejs Node 24: $LATEST_NODE24"
           fi
-
-          echo "latest_node20=$LATEST_NODE20" >> $GITHUB_OUTPUT
-          echo "latest_node24=$LATEST_NODE24" >> $GITHUB_OUTPUT
-
+          # Abort if no valid Node versions are found
+          if [ -z "$LATEST_NODE20" ] && [ -z "$LATEST_NODE24" ]; then
+            echo "::error title=Node Version Update::Could not find valid Node 20 or Node 24 version in alpine_nodejs releases. Aborting."
+            exit 1
+          fi
           # Check current versions in externals.sh
           CURRENT_NODE20=$(grep "NODE20_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
           CURRENT_NODE24=$(grep "NODE24_VERSION=" src/Misc/externals.sh | cut -d'"' -f2)
-
           echo "current_node20=$CURRENT_NODE20" >> $GITHUB_OUTPUT
           echo "current_node24=$CURRENT_NODE24" >> $GITHUB_OUTPUT
-
           # Determine if updates are needed
           NEEDS_UPDATE20="false"
           NEEDS_UPDATE24="false"
-
-          if [ "$CURRENT_NODE20" != "$LATEST_NODE20" ]; then
+          if [ -n "$LATEST_NODE20" ] && [ "$CURRENT_NODE20" != "$LATEST_NODE20" ]; then
             NEEDS_UPDATE20="true"
             echo "::notice title=Node 20 Update Available::Current: $CURRENT_NODE20 → Latest: $LATEST_NODE20"
           fi
-
-          if [ "$CURRENT_NODE24" != "$LATEST_NODE24" ]; then
+          if [ -n "$LATEST_NODE24" ] && [ "$CURRENT_NODE24" != "$LATEST_NODE24" ]; then
             NEEDS_UPDATE24="true"
             echo "::notice title=Node 24 Update Available::Current: $CURRENT_NODE24 → Latest: $LATEST_NODE24"
           fi
-
           if [ "$NEEDS_UPDATE20" == "false" ] && [ "$NEEDS_UPDATE24" == "false" ]; then
             echo "::notice title=No Updates Needed::All Node.js versions are up to date"
           fi
-
+          echo "latest_node20=$LATEST_NODE20" >> $GITHUB_OUTPUT
+          echo "latest_node24=$LATEST_NODE24" >> $GITHUB_OUTPUT
           echo "needs_update20=$NEEDS_UPDATE20" >> $GITHUB_OUTPUT
           echo "needs_update24=$NEEDS_UPDATE24" >> $GITHUB_OUTPUT
-
       - name: Update externals.sh and create PR
         if: steps.node-versions.outputs.needs_update20 == 'true' || steps.node-versions.outputs.needs_update24 == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Update the files
-          if [ "${{ steps.node-versions.outputs.needs_update20 }}" == "true" ]; then
+          set -e
+          # Only update if a valid version is found
+          if [ "${{ steps.node-versions.outputs.needs_update20 }}" == "true" ] && [ -n "${{ steps.node-versions.outputs.latest_node20 }}" ]; then
             sed -i 's/NODE20_VERSION="[^"]*"/NODE20_VERSION="${{ steps.node-versions.outputs.latest_node20 }}"/' src/Misc/externals.sh
           fi
-
-          if [ "${{ steps.node-versions.outputs.needs_update24 }}" == "true" ]; then
+          if [ "${{ steps.node-versions.outputs.needs_update24 }}" == "true" ] && [ -n "${{ steps.node-versions.outputs.latest_node24 }}" ]; then
             sed -i 's/NODE24_VERSION="[^"]*"/NODE24_VERSION="${{ steps.node-versions.outputs.latest_node24 }}"/' src/Misc/externals.sh
           fi
-
           # Configure git
           git config --global user.name "github-actions[bot]"
           git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
-
           # Create branch and commit changes
           branch_name="chore/update-node"
           git checkout -b "$branch_name"
           git commit -a -m "chore: update Node versions (20: ${{ steps.node-versions.outputs.latest_node20 }}, 24: ${{ steps.node-versions.outputs.latest_node24 }})"
           git push --force origin "$branch_name"
-
           # Create PR body using here-doc for proper formatting
-          cat > pr_body.txt << 'EOF'
-          Automated Node.js version update:
+          cat > pr_body.txt << EOF
+Automated Node.js version update:
 
-          - Node 20: ${{ steps.node-versions.outputs.current_node20 }} → ${{ steps.node-versions.outputs.latest_node20 }}
-          - Node 24: ${{ steps.node-versions.outputs.current_node24 }} → ${{ steps.node-versions.outputs.latest_node24 }}
+- Node 20: ${{ steps.node-versions.outputs.current_node20 }} → ${{ steps.node-versions.outputs.latest_node20 }}
+- Node 24: ${{ steps.node-versions.outputs.current_node24 }} → ${{ steps.node-versions.outputs.latest_node24 }}
 
-          This update ensures we're using the latest stable Node.js versions for security and performance improvements.
+This update ensures we're using the latest stable Node.js versions for security and performance improvements.
 
-          **Note**: When updating Node versions, remember to also create a new release of alpine_nodejs at the updated version following the instructions at: https://github.com/actions/alpine_nodejs
-
-          ---
-
-          Autogenerated by [Node Version Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/node-upgrade.yml)
-          EOF
+**Note**: When updating Node versions, remember to also create a new release of alpine_nodejs at the updated version following the instructions at: https://github.com/actions/alpine_nodejs
 
+---
+Autogenerated by [Node Version Upgrade Workflow](https://github.com/actions/runner/blob/main/.github/workflows/node-upgrade.yml)
+EOF
           # Create PR
           gh pr create -B main -H "$branch_name" \
             --title "chore: update Node versions" \
@@ -126,5 +109,4 @@ jobs:
             --label "node" \
             --label "javascript" \
             --body-file pr_body.txt
-
           echo "::notice title=PR Created::Successfully created Node.js version update PR on branch $branch_name"

src/Runner.Worker/Container/DockerCommandManager.cs

@@ -111,19 +111,19 @@ namespace GitHub.Runner.Worker.Container
         {
             IList<string> dockerOptions = new List<string>();
             // OPTIONS
-            dockerOptions.Add(DockerUtil.CreateEscapedOption("--name", container.ContainerDisplayName));
+            dockerOptions.Add($"--name {container.ContainerDisplayName}");
             dockerOptions.Add($"--label {DockerInstanceLabel}");
             if (!string.IsNullOrEmpty(container.ContainerWorkDirectory))
             {
-                dockerOptions.Add(DockerUtil.CreateEscapedOption("--workdir", container.ContainerWorkDirectory));
+                dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}");
             }
             if (!string.IsNullOrEmpty(container.ContainerNetwork))
             {
-                dockerOptions.Add(DockerUtil.CreateEscapedOption("--network", container.ContainerNetwork));
+                dockerOptions.Add($"--network {container.ContainerNetwork}");
             }
             if (!string.IsNullOrEmpty(container.ContainerNetworkAlias))
             {
-                dockerOptions.Add(DockerUtil.CreateEscapedOption("--network-alias", container.ContainerNetworkAlias));
+                dockerOptions.Add($"--network-alias {container.ContainerNetworkAlias}");
             }
             foreach (var port in container.UserPortMappings)
             {
@@ -195,10 +195,10 @@ namespace GitHub.Runner.Worker.Container
         {
             IList<string> dockerOptions = new List<string>();
             // OPTIONS
-            dockerOptions.Add(DockerUtil.CreateEscapedOption("--name", container.ContainerDisplayName));
+            dockerOptions.Add($"--name {container.ContainerDisplayName}");
             dockerOptions.Add($"--label {DockerInstanceLabel}");
 
-            dockerOptions.Add(DockerUtil.CreateEscapedOption("--workdir", container.ContainerWorkDirectory));
+            dockerOptions.Add($"--workdir {container.ContainerWorkDirectory}");
             dockerOptions.Add($"--rm");
 
             foreach (var env in container.ContainerEnvironmentVariables)

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -249,7 +249,7 @@ namespace GitHub.Runner.Worker.Handlers
             {
                 // We do not not the full path until we know what shell is being used, so that we can determine the file extension
                 scriptFilePath = Path.Combine(tempDirectory, $"{Guid.NewGuid()}{ScriptHandlerHelpers.GetScriptFileExtension(shellCommand)}");
-                resolvedScriptPath = $"\"{StepHost.ResolvePathForStepHost(ExecutionContext, scriptFilePath).Replace("\"", "\\\"")}\"";
+                resolvedScriptPath = StepHost.ResolvePathForStepHost(ExecutionContext, scriptFilePath).Replace("\"", "\\\"");
             }
             else
             {
@@ -260,7 +260,7 @@ namespace GitHub.Runner.Worker.Handlers
                 }
                 scriptFilePath = Inputs["path"];
                 ArgUtil.NotNullOrEmpty(scriptFilePath, "path");
-                resolvedScriptPath = $"\"{Inputs["path"].Replace("\"", "\\\"")}\"";
+                resolvedScriptPath = Inputs["path"].Replace("\"", "\\\"");
             }
 
             // Format arg string with script path

src/Runner.Worker/Handlers/ScriptHandlerHelpers.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text.RegularExpressions;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
@@ -64,47 +63,10 @@ namespace GitHub.Runner.Worker.Handlers
                     var append = @"if ((Test-Path -LiteralPath variable:\LASTEXITCODE)) { exit $LASTEXITCODE }";
                     contents = $"{prepend}{Environment.NewLine}{contents}{Environment.NewLine}{append}";
                     break;
-                case "bash":
-                case "sh":
-                    contents = FixBashEnvironmentVariables(contents);
-                    break;
             }
             return contents;
         }
 
-        /// <summary>
-        /// Fixes unquoted environment variables in bash/sh scripts to prevent issues with paths containing spaces.
-        /// This method quotes environment variables used in shell redirects and command substitutions.
-        /// </summary>
-        /// <param name="contents">The shell script content to fix</param>
-        /// <returns>Fixed shell script content with properly quoted environment variables</returns>
-        private static string FixBashEnvironmentVariables(string contents)
-        {
-            if (string.IsNullOrEmpty(contents))
-            {
-                return contents;
-            }
-
-            // Pattern to match environment variables in shell redirects that aren't already quoted
-            // This targets patterns like: >> $GITHUB_STEP_SUMMARY, > $GITHUB_OUTPUT, etc.
-            // but avoids already quoted ones like: >> "$GITHUB_STEP_SUMMARY" or >> '$GITHUB_OUTPUT'
-            var redirectPattern = new Regex(
-                @"(\s+(?:>>|>|<|2>>|2>)\s+)(\$[A-Za-z_][A-Za-z0-9_]*)\b(?!\s*['""])",
-                RegexOptions.Compiled | RegexOptions.Multiline
-            );
-
-            // Replace unquoted environment variables in redirects with quoted versions
-            contents = redirectPattern.Replace(contents, match =>
-            {
-                var redirectOperator = match.Groups[1].Value; // e.g., " >> "
-                var envVar = match.Groups[2].Value; // e.g., "$GITHUB_STEP_SUMMARY"
-                
-                return $"{redirectOperator}\"{envVar}\"";
-            });
-
-            return contents;
-        }
-
         internal static (string shellCommand, string shellArgs) ParseShellOptionString(string shellOption)
         {
             var shellStringParts = shellOption.Split(" ", 2);

src/Runner.Worker/Handlers/StepHost.cs

@@ -220,7 +220,7 @@ namespace GitHub.Runner.Worker.Handlers
 
             // [OPTIONS]
             dockerCommandArgs.Add($"-i");
-            dockerCommandArgs.Add(DockerUtil.CreateEscapedOption("--workdir", workingDirectory));
+            dockerCommandArgs.Add($"--workdir {workingDirectory}");
             foreach (var env in environment)
             {
                 // e.g. -e MY_SECRET maps the value into the exec'ed process without exposing

src/Runner.Worker/Runner.Worker.csproj

@@ -12,12 +12,6 @@
     <PublishReadyToRunComposite>true</PublishReadyToRunComposite>
   </PropertyGroup>
 
-  <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Test</_Parameter1>
-    </AssemblyAttribute>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Sdk\Sdk.csproj" />
     <ProjectReference Include="..\Runner.Common\Runner.Common.csproj" />

src/Test/L0/Worker/Handlers/ScriptHandlerL0.cs

@@ -1,278 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Handlers;
-using Moq;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Worker.Handlers
-{
-    public sealed class ScriptHandlerL0
-    {
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ScriptPath_WithSpaces_ShouldBeQuoted()
-        {
-            // Arrange - Test the path quoting logic that our fix addresses
-            var tempPathWithSpaces = "/path with spaces/_temp";
-            var scriptPathWithSpaces = Path.Combine(tempPathWithSpaces, "test-script.sh");
-            
-            // Test the original (broken) behavior 
-            var originalPath = scriptPathWithSpaces.Replace("\"", "\\\"");
-            
-            // Test our fix - properly quoted path
-            var quotedPath = $"\"{scriptPathWithSpaces.Replace("\"", "\\\"")}\"";
-            
-            // Assert
-            Assert.False(originalPath.StartsWith("\""), "Original path should not be quoted");
-            Assert.True(quotedPath.StartsWith("\"") && quotedPath.EndsWith("\""), "Fixed path should be properly quoted");
-            Assert.Contains("path with spaces", quotedPath, StringComparison.Ordinal);
-            
-            // Verify the path is properly quoted (platform-agnostic check)
-            Assert.True(quotedPath.StartsWith("\"/path with spaces/_temp"), "Path should start with quoted temp directory");
-            Assert.True(quotedPath.EndsWith("test-script.sh\""), "Path should end with quoted script name");
-        }
-        
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ScriptPath_WithQuotes_ShouldEscapeQuotes()
-        {
-            // Arrange - Test paths that contain quotes
-            var pathWithQuotes = "/path/\"quoted folder\"/script.sh";
-            
-            // Test our fix - properly escape quotes and wrap in quotes
-            var quotedPath = $"\"{pathWithQuotes.Replace("\"", "\\\"")}\"";
-            
-            // Assert
-            Assert.True(quotedPath.StartsWith("\"") && quotedPath.EndsWith("\""), "Path should be wrapped in quotes");
-            Assert.Contains("\\\"", quotedPath, StringComparison.Ordinal);
-            Assert.Contains("quoted folder", quotedPath, StringComparison.Ordinal);
-            
-            // Verify quotes are properly escaped
-            Assert.Contains("\\\"quoted folder\\\"", quotedPath, StringComparison.Ordinal);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ScriptPath_ActionsRunnerWithSpaces_ShouldBeQuoted()
-        {
-            // Arrange - Test the specific real-world scenario that was failing
-            var runnerPathWithSpaces = "/Users/user/Downloads/actions-runner-osx-arm64-2.328.0 2";
-            var tempPath = Path.Combine(runnerPathWithSpaces, "_work", "_temp");
-            var scriptPath = Path.Combine(tempPath, "script-guid.sh");
-            
-            // Test our fix
-            var quotedPath = $"\"{scriptPath.Replace("\"", "\\\"")}\"";
-            
-            // Assert
-            Assert.True(quotedPath.StartsWith("\"") && quotedPath.EndsWith("\""), "Path should be wrapped in quotes");
-            Assert.Contains("actions-runner-osx-arm64-2.328.0 2", quotedPath, StringComparison.Ordinal);
-            Assert.Contains("_work", quotedPath, StringComparison.Ordinal);
-            Assert.Contains("_temp", quotedPath, StringComparison.Ordinal);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ScriptPath_MultipleSpaces_ShouldBeQuoted()
-        {
-            // Arrange - Test paths with multiple spaces
-            var pathWithMultipleSpaces = "/path/with  multiple   spaces/script.sh";
-            
-            // Test our fix
-            var quotedPath = $"\"{pathWithMultipleSpaces.Replace("\"", "\\\"")}\"";
-            
-            // Assert
-            Assert.True(quotedPath.StartsWith("\"") && quotedPath.EndsWith("\""), "Path should be wrapped in quotes");
-            Assert.Contains("multiple   spaces", quotedPath, StringComparison.Ordinal);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ScriptPath_WithoutSpaces_ShouldStillBeQuoted()
-        {
-            // Arrange - Test normal paths without spaces (regression test)
-            var normalPath = "/home/user/runner/_work/_temp/script.sh";
-            
-            // Test our fix
-            var quotedPath = $"\"{normalPath.Replace("\"", "\\\"")}\"";
-            
-            // Assert
-            Assert.True(quotedPath.StartsWith("\"") && quotedPath.EndsWith("\""), "Path should be wrapped in quotes");
-            Assert.Equal($"\"{normalPath}\"", quotedPath);
-        }
-
-        [Theory]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        [InlineData("/path with spaces/script.sh")]
-        [InlineData("/Users/user/Downloads/actions-runner-osx-arm64-2.328.0 2/_work/_temp/guid.sh")]
-        [InlineData("C:\\Program Files\\GitHub Runner\\script.cmd")]
-        [InlineData("/path/\"with quotes\"/script.sh")]
-        [InlineData("/path/with'single'quotes/script.sh")]
-        public void ScriptPath_VariousScenarios_ShouldBeProperlyQuoted(string inputPath)
-        {
-            // Arrange & Act
-            var quotedPath = $"\"{inputPath.Replace("\"", "\\\"")}\"";
-            
-            // Assert
-            Assert.True(quotedPath.StartsWith("\""), "Path should start with quote");
-            Assert.True(quotedPath.EndsWith("\""), "Path should end with quote");
-            
-            // Ensure the original path content is preserved
-            var unquotedContent = quotedPath.Substring(1, quotedPath.Length - 2);
-            if (inputPath.Contains("\""))
-            {
-                // If original had quotes, they should be escaped in the result
-                Assert.Contains("\\\"", unquotedContent);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void FixUpScriptContents_BashEnvironmentVariables_ShouldQuoteRedirects()
-        {
-            // Arrange
-            var scriptContent = @"echo ""## Dependency Status Report"" >> $GITHUB_STEP_SUMMARY
-echo ""Generated on: $(date)"" >> $GITHUB_STEP_SUMMARY
-echo ""| Component | Status |"" > $GITHUB_OUTPUT
-echo ""npm-status=ok"" >> $GITHUB_OUTPUT";
-
-            // Act
-            var fixedContent = ScriptHandlerHelpers.FixUpScriptContents("bash", scriptContent);
-
-            // Assert
-            Assert.Contains(">> \"$GITHUB_STEP_SUMMARY\"", fixedContent);
-            Assert.Contains("> \"$GITHUB_OUTPUT\"", fixedContent);
-            Assert.DoesNotContain(">> $GITHUB_STEP_SUMMARY", fixedContent);
-            Assert.DoesNotContain("> $GITHUB_OUTPUT", fixedContent);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void FixUpScriptContents_AlreadyQuotedVariables_ShouldNotDoubleQuote()
-        {
-            // Arrange
-            var scriptContent = @"echo ""test"" >> ""$GITHUB_STEP_SUMMARY""
-echo ""test"" > '$GITHUB_OUTPUT'
-echo ""test"" 2>> ""$GITHUB_ENV""";
-
-            // Act
-            var fixedContent = ScriptHandlerHelpers.FixUpScriptContents("bash", scriptContent);
-
-            // Assert - Should remain unchanged
-            Assert.Equal(scriptContent, fixedContent);
-            Assert.Contains(">> \"$GITHUB_STEP_SUMMARY\"", fixedContent);
-            Assert.Contains("> '$GITHUB_OUTPUT'", fixedContent);
-            Assert.Contains("2>> \"$GITHUB_ENV\"", fixedContent);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void FixUpScriptContents_ShellRedirectOperators_ShouldHandleAllTypes()
-        {
-            // Arrange
-            var scriptContent = @"echo ""test"" >> $VAR1
-echo ""test"" > $VAR2
-cat < $VAR3
-echo ""test"" 2>> $VAR4
-echo ""test"" 2> $VAR5";
-
-            // Act
-            var fixedContent = ScriptHandlerHelpers.FixUpScriptContents("sh", scriptContent);
-
-            // Assert
-            Assert.Contains(">> \"$VAR1\"", fixedContent);
-            Assert.Contains("> \"$VAR2\"", fixedContent);
-            Assert.Contains("< \"$VAR3\"", fixedContent);
-            Assert.Contains("2>> \"$VAR4\"", fixedContent);
-            Assert.Contains("2> \"$VAR5\"", fixedContent);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void FixUpScriptContents_NonShellTypes_ShouldNotModifyEnvironmentVariables()
-        {
-            // Arrange
-            var scriptContent = @"echo ""test"" >> $GITHUB_STEP_SUMMARY";
-
-            // Act
-            var powershellFixed = ScriptHandlerHelpers.FixUpScriptContents("powershell", scriptContent);
-            var cmdFixed = ScriptHandlerHelpers.FixUpScriptContents("cmd", scriptContent);
-            var pythonFixed = ScriptHandlerHelpers.FixUpScriptContents("python", scriptContent);
-
-            // Assert - Should not modify environment variables for non-shell types
-            Assert.Contains(">> $GITHUB_STEP_SUMMARY", powershellFixed);
-            Assert.Contains(">> $GITHUB_STEP_SUMMARY", cmdFixed);
-            Assert.Contains(">> $GITHUB_STEP_SUMMARY", pythonFixed);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void FixUpScriptContents_ComplexScript_ShouldQuoteOnlyUnquotedRedirects()
-        {
-            // Arrange
-            var scriptContent = @"#!/bin/bash
-# This is a test script
-echo ""Starting workflow"" >> $GITHUB_STEP_SUMMARY
-echo ""Already quoted"" >> ""$GITHUB_OUTPUT""
-export MY_VAR=""$HOME/path with spaces""
-curl -s https://api.github.com/rate_limit > $TEMP_FILE
-echo ""Final status"" 2>> $ERROR_LOG
-if [ -f ""$GITHUB_ENV"" ]; then
-    echo ""MY_VAR=test"" >> $GITHUB_ENV
-fi";
-
-            // Act
-            var fixedContent = ScriptHandlerHelpers.FixUpScriptContents("bash", scriptContent);
-
-            // Assert
-            Assert.Contains(">> \"$GITHUB_STEP_SUMMARY\"", fixedContent);
-            Assert.Contains(">> \"$GITHUB_OUTPUT\"", fixedContent); // Should remain quoted
-            Assert.Contains("> \"$TEMP_FILE\"", fixedContent);
-            Assert.Contains("2>> \"$ERROR_LOG\"", fixedContent);
-            Assert.Contains(">> \"$GITHUB_ENV\"", fixedContent);
-            
-            // Other parts should remain unchanged
-            Assert.Contains("#!/bin/bash", fixedContent);
-            Assert.Contains("# This is a test script", fixedContent);
-            Assert.Contains("export MY_VAR=\"$HOME/path with spaces\"", fixedContent);
-            Assert.Contains("if [ -f \"$GITHUB_ENV\" ]; then", fixedContent);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void FixUpScriptContents_EnvironmentVariablesInCommands_ShouldNotQuote()
-        {
-            // Arrange - Environment variables not in redirects should not be touched
-            var scriptContent = @"echo $GITHUB_STEP_SUMMARY
-cd $HOME
-ls -la $TEMP_DIR
-if [ ""$MY_VAR"" == ""test"" ]; then
-    echo ""match""
-fi";
-
-            // Act
-            var fixedContent = ScriptHandlerHelpers.FixUpScriptContents("bash", scriptContent);
-
-            // Assert - Should remain unchanged as these are not redirects
-            Assert.Equal(scriptContent, fixedContent);
-        }
-    }
-}