Bump version to 2.333.1

.github/workflows/build.yml

@@ -99,7 +99,7 @@ jobs:
 
     - name: Get latest runner version
       id: latest_runner
-      uses: actions/github-script@v9
+      uses: actions/github-script@v8
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |

.github/workflows/docker-publish.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Compute image version
         id: image
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const fs = require('fs');

.github/workflows/node-upgrade.yml

@@ -159,36 +159,18 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "<41898282+github-actions[bot]@users.noreply.github.com>"
 
-          # Build version summary for commit message and PR body (only include changed versions)
-          COMMIT_VERSIONS=""
-          PR_VERSION_LINES=""
-
-          if [ "${{ steps.node-versions.outputs.needs_update20 }}" == "true" ]; then
-            COMMIT_VERSIONS="20: $NODE20_VERSION"
-            PR_VERSION_LINES="- Node 20: ${{ steps.node-versions.outputs.current_node20 }} → $NODE20_VERSION"
-          fi
-
-          if [ "${{ steps.node-versions.outputs.needs_update24 }}" == "true" ]; then
-            if [ -n "$COMMIT_VERSIONS" ]; then
-              COMMIT_VERSIONS="$COMMIT_VERSIONS, 24: $NODE24_VERSION"
-            else
-              COMMIT_VERSIONS="24: $NODE24_VERSION"
-            fi
-            PR_VERSION_LINES="${PR_VERSION_LINES:+$PR_VERSION_LINES
-          }- Node 24: ${{ steps.node-versions.outputs.current_node24 }} → $NODE24_VERSION"
-          fi
-
           # Create branch and commit changes
           branch_name="chore/update-node"
           git checkout -b "$branch_name"
-          git commit -a -m "chore: update Node versions ($COMMIT_VERSIONS)"
+          git commit -a -m "chore: update Node versions (20: $NODE20_VERSION, 24: $NODE24_VERSION)"
           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:
 
-          $PR_VERSION_LINES
+          - Node 20: ${{ steps.node-versions.outputs.current_node20 }} → $NODE20_VERSION
+          - Node 24: ${{ steps.node-versions.outputs.current_node24 }} → $NODE24_VERSION
 
           This update ensures we're using the latest stable Node.js versions for security and performance improvements.
 

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     # Make sure ./releaseVersion match ./src/runnerversion
     # Query GitHub release ensure version is not used
     - name: Check version
-      uses: actions/github-script@v9
+      uses: actions/github-script@v8
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -171,7 +171,7 @@ jobs:
     # Create ReleaseNote file
     - name: Create ReleaseNote
       id: releaseNote
-      uses: actions/github-script@v9
+      uses: actions/github-script@v8
       with:
         github-token: ${{secrets.GITHUB_TOKEN}}
         script: |
@@ -300,7 +300,7 @@ jobs:
 
       - name: Compute image version
         id: image
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
         with:
           script: |
             const fs = require('fs');

images/Dockerfile

@@ -5,8 +5,8 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG RUNNER_VERSION
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.7.0
-ARG DOCKER_VERSION=29.3.1
-ARG BUILDX_VERSION=0.33.0
+ARG DOCKER_VERSION=29.3.0
+ARG BUILDX_VERSION=0.32.1
 
 RUN apt update -y && apt install curl unzip -y
 

releaseNote.md

@@ -1,33 +1,7 @@
 ## What's Changed
-* Log inner exception message. by @TingluoHuang in https://github.com/actions/runner/pull/4265
-* Fix composite post-step marker display names by @ericsciple in https://github.com/actions/runner/pull/4267
-* Bump actions/download-artifact from 7 to 8 by @dependabot[bot] in https://github.com/actions/runner/pull/4269
-* chore: update Node versions by @github-actions[bot] in https://github.com/actions/runner/pull/4272
-* Avoid throw in SelfUpdaters. by @TingluoHuang in https://github.com/actions/runner/pull/4274
-* Fix parser comparison mismatches by @ericsciple in https://github.com/actions/runner/pull/4273
-* Devcontainer: bump base image Ubuntu version by @MaxHorstmann in https://github.com/actions/runner/pull/4277
-* Support `entrypoint` and `command` for service containers by @ericsciple in https://github.com/actions/runner/pull/4276
-* Bump actions/upload-artifact from 6 to 7 by @dependabot[bot] in https://github.com/actions/runner/pull/4270
-* Bump docker/login-action from 3 to 4 by @dependabot[bot] in https://github.com/actions/runner/pull/4278
-* Fix positional arg bug in ExpressionParser.CreateTree by @ericsciple in https://github.com/actions/runner/pull/4279
-* Bump docker/build-push-action from 6 to 7 by @dependabot[bot] in https://github.com/actions/runner/pull/4283
-* Bump docker/setup-buildx-action from 3 to 4 by @dependabot[bot] in https://github.com/actions/runner/pull/4282
-* Bump actions/attest-build-provenance from 3 to 4 by @dependabot[bot] in https://github.com/actions/runner/pull/4266
-* Bump @stylistic/eslint-plugin from 5.9.0 to 5.10.0 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/4281
-* Update Docker to v29.3.0 and Buildx to v0.32.1 by @github-actions[bot] in https://github.com/actions/runner/pull/4286
-* chore: update Node versions by @github-actions[bot] in https://github.com/actions/runner/pull/4287
-* Fix cancellation token race during parser comparison by @ericsciple in https://github.com/actions/runner/pull/4280
-* Bump @typescript-eslint/eslint-plugin from 8.47.0 to 8.54.0 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/4230
-* Exit with specified exit code when runner is outdated by @nikola-jokic in https://github.com/actions/runner/pull/4285
-* Report infra_error for action download failures. by @TingluoHuang in https://github.com/actions/runner/pull/4294
-* Update dotnet sdk to latest version @8.0.419 by @github-actions[bot] in https://github.com/actions/runner/pull/4301
-* Node 24 enforcement + Linux ARM32 deprecation support by @salmanmkc in https://github.com/actions/runner/pull/4303
-* Bump @typescript-eslint/eslint-plugin from 8.54.0 to 8.57.1 in /src/Misc/expressionFunc/hashFiles by @dependabot[bot] in https://github.com/actions/runner/pull/4304
+* Remove AllowCaseFunction feature flag by @ericsciple in https://github.com/actions/runner/pull/4316
 
-## New Contributors
-* @MaxHorstmann made their first contribution in https://github.com/actions/runner/pull/4277
-
-**Full Changelog**: https://github.com/actions/runner/compare/v2.332.0...v2.333.0
+**Full Changelog**: https://github.com/actions/runner/compare/v2.333.0...v2.333.1
 
 _Note: Actions Runner follows a progressive release policy, so the latest release might not be available to your enterprise, organization, or repository yet.
 To confirm which version of the Actions Runner you should expect, please view the download instructions for your enterprise, organization, or repository.

releaseVersion

@@ -1 +1 @@
-<Update to ./src/runnerversion when creating release>
+2.333.1

src/Misc/expressionFunc/hashFiles/package.json

@@ -32,20 +32,20 @@
   "author": "GitHub Actions",
   "license": "MIT",
   "dependencies": {
-    "@actions/glob": "^0.6.1"
+    "@actions/glob": "^0.4.0"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/node": "^22.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.58.1",
-    "@typescript-eslint/parser": "^8.58.1",
+    "@typescript-eslint/eslint-plugin": "^8.57.1",
+    "@typescript-eslint/parser": "^8.0.0",
     "@vercel/ncc": "^0.38.3",
     "eslint": "^8.47.0",
     "eslint-plugin-github": "^4.10.2",
     "eslint-plugin-prettier": "^5.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.4.0",
+    "lint-staged": "^15.5.0",
     "prettier": "^3.0.3",
-    "typescript": "^6.0.2"
+    "typescript": "^5.9.3"
   }
 }

src/Misc/externals.sh

@@ -6,8 +6,8 @@ NODE_URL=https://nodejs.org/dist
 NODE_ALPINE_URL=https://github.com/actions/alpine_nodejs/releases/download
 # When you update Node versions you must also create a new release of alpine_nodejs at that updated version.
 # Follow the instructions here: https://github.com/actions/alpine_nodejs?tab=readme-ov-file#getting-started
-NODE20_VERSION="20.20.2"
-NODE24_VERSION="24.14.1"
+NODE20_VERSION="20.20.1"
+NODE24_VERSION="24.14.0"
 
 get_abs_path() {
   # exploits the fact that pwd will print abs path when no args

src/Runner.Common/Constants.cs

@@ -177,8 +177,6 @@ namespace GitHub.Runner.Common
                 public static readonly string SetOrchestrationIdEnvForActions = "actions_set_orchestration_id_env_for_actions";
                 public static readonly string SendJobLevelAnnotations = "actions_send_job_level_annotations";
                 public static readonly string EmitCompositeMarkers = "actions_runner_emit_composite_markers";
-                public static readonly string BatchActionResolution = "actions_batch_action_resolution";
-                public static readonly string UseBearerTokenForCodeload = "actions_use_bearer_token_for_codeload";
             }
 
             // Node version migration related constants

src/Runner.Common/Runner.Common.csproj

@@ -17,9 +17,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.3" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.3" />
-    <PackageReference Include="System.Threading.Channels" Version="10.0.3" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Common/Tracing.cs

@@ -12,13 +12,6 @@ namespace GitHub.Runner.Common
         private ISecretMasker _secretMasker;
         private TraceSource _traceSource;
 
-        /// <summary>
-        /// The underlying <see cref="System.Diagnostics.TraceSource"/> for this instance.
-        /// Useful when third-party libraries require a <see cref="System.Diagnostics.TraceSource"/>
-        /// to route their diagnostics into the runner's log infrastructure.
-        /// </summary>
-        public TraceSource Source => _traceSource;
-
         public Tracing(string name, ISecretMasker secretMasker, SourceSwitch sourceSwitch, HostTraceListener traceListener, StdoutTraceListener stdoutTraceListener = null)
         {
             ArgUtil.NotNull(secretMasker, nameof(secretMasker));

src/Runner.Listener/Runner.Listener.csproj

@@ -22,8 +22,8 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.3" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.3" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Sdk/Runner.Sdk.csproj

@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.3" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="System.Threading.Channels" Version="10.0.3" />
+    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Worker/ActionManager.cs

@@ -79,13 +79,6 @@ namespace GitHub.Runner.Worker
                 PreStepTracker = new Dictionary<Guid, IActionRunner>()
             };
             var containerSetupSteps = new List<JobExtensionRunner>();
-            var batchActionResolution = (executionContext.Global.Variables.GetBoolean(Constants.Runner.Features.BatchActionResolution) ?? false)
-                || StringUtil.ConvertToBoolean(Environment.GetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION"));
-            // Stack-local cache: same action (owner/repo@ref) is resolved only once,
-            // even if it appears at multiple depths in a composite tree.
-            var resolvedDownloadInfos = batchActionResolution
-                ? new Dictionary<string, WebApi.ActionDownloadInfo>(StringComparer.Ordinal)
-                : null;
             var depth = 0;
             // We are running at the start of a job
             if (rootStepId == default(Guid))
@@ -112,9 +105,7 @@ namespace GitHub.Runner.Worker
             PrepareActionsState result = new PrepareActionsState();
             try
             {
-                result = batchActionResolution
-                    ? await PrepareActionsRecursiveAsync(executionContext, state, actions, resolvedDownloadInfos, depth, rootStepId)
-                    : await PrepareActionsRecursiveLegacyAsync(executionContext, state, actions, depth, rootStepId);
+                result = await PrepareActionsRecursiveAsync(executionContext, state, actions, depth, rootStepId);
             }
             catch (FailedToResolveActionDownloadInfoException ex)
             {
@@ -178,192 +169,7 @@ namespace GitHub.Runner.Worker
             return new PrepareResult(containerSetupSteps, result.PreStepTracker);
         }
 
-        private async Task<PrepareActionsState> PrepareActionsRecursiveAsync(IExecutionContext executionContext, PrepareActionsState state, IEnumerable<Pipelines.ActionStep> actions, Dictionary<string, WebApi.ActionDownloadInfo> resolvedDownloadInfos, Int32 depth = 0, Guid parentStepId = default(Guid))
-        {
-            ArgUtil.NotNull(executionContext, nameof(executionContext));
-            if (depth > Constants.CompositeActionsMaxDepth)
-            {
-                throw new Exception($"Composite action depth exceeded max depth {Constants.CompositeActionsMaxDepth}");
-            }
-
-            var repositoryActions = new List<Pipelines.ActionStep>();
-
-            foreach (var action in actions)
-            {
-                if (action.Reference.Type == Pipelines.ActionSourceType.ContainerRegistry)
-                {
-                    ArgUtil.NotNull(action, nameof(action));
-                    var containerReference = action.Reference as Pipelines.ContainerRegistryReference;
-                    ArgUtil.NotNull(containerReference, nameof(containerReference));
-                    ArgUtil.NotNullOrEmpty(containerReference.Image, nameof(containerReference.Image));
-
-                    if (!state.ImagesToPull.ContainsKey(containerReference.Image))
-                    {
-                        state.ImagesToPull[containerReference.Image] = new List<Guid>();
-                    }
-
-                    Trace.Info($"Action {action.Name} ({action.Id}) needs to pull image '{containerReference.Image}'");
-                    state.ImagesToPull[containerReference.Image].Add(action.Id);
-                }
-                else if (action.Reference.Type == Pipelines.ActionSourceType.Repository)
-                {
-                    repositoryActions.Add(action);
-                }
-            }
-
-            if (repositoryActions.Count > 0)
-            {
-                // Resolve download info, skipping any actions already cached.
-                await ResolveNewActionsAsync(executionContext, repositoryActions, resolvedDownloadInfos);
-
-                // Download each action.
-                foreach (var action in repositoryActions)
-                {
-                    var lookupKey = GetDownloadInfoLookupKey(action);
-                    if (string.IsNullOrEmpty(lookupKey))
-                    {
-                        continue;
-                    }
-                    if (!resolvedDownloadInfos.TryGetValue(lookupKey, out var downloadInfo))
-                    {
-                        throw new Exception($"Missing download info for {lookupKey}");
-                    }
-                    await DownloadRepositoryActionAsync(executionContext, downloadInfo);
-                }
-
-                // Parse action.yml and collect composite sub-actions for batched
-                // resolution below. Pre/post step registration is deferred until
-                // after recursion so that HasPre/HasPost reflect the full subtree.
-                var nextLevel = new List<(Pipelines.ActionStep action, Guid parentId)>();
-
-                foreach (var action in repositoryActions)
-                {
-                    var setupInfo = PrepareRepositoryActionAsync(executionContext, action);
-                    if (setupInfo != null && setupInfo.Container != null)
-                    {
-                        if (!string.IsNullOrEmpty(setupInfo.Container.Image))
-                        {
-                            if (!state.ImagesToPull.ContainsKey(setupInfo.Container.Image))
-                            {
-                                state.ImagesToPull[setupInfo.Container.Image] = new List<Guid>();
-                            }
-
-                            Trace.Info($"Action {action.Name} ({action.Id}) from repository '{setupInfo.Container.ActionRepository}' needs to pull image '{setupInfo.Container.Image}'");
-                            state.ImagesToPull[setupInfo.Container.Image].Add(action.Id);
-                        }
-                        else
-                        {
-                            ArgUtil.NotNullOrEmpty(setupInfo.Container.ActionRepository, nameof(setupInfo.Container.ActionRepository));
-
-                            if (!state.ImagesToBuild.ContainsKey(setupInfo.Container.ActionRepository))
-                            {
-                                state.ImagesToBuild[setupInfo.Container.ActionRepository] = new List<Guid>();
-                            }
-
-                            Trace.Info($"Action {action.Name} ({action.Id}) from repository '{setupInfo.Container.ActionRepository}' needs to build image '{setupInfo.Container.Dockerfile}'");
-                            state.ImagesToBuild[setupInfo.Container.ActionRepository].Add(action.Id);
-                            state.ImagesToBuildInfo[setupInfo.Container.ActionRepository] = setupInfo.Container;
-                        }
-                    }
-                    else if (setupInfo != null && setupInfo.Steps != null && setupInfo.Steps.Count > 0)
-                    {
-                        foreach (var step in setupInfo.Steps)
-                        {
-                            nextLevel.Add((step, action.Id));
-                        }
-                    }
-                }
-
-                // Resolve all next-level sub-actions in one batch API call,
-                // then recurse per parent (which hits the cache, not the API).
-                if (nextLevel.Count > 0)
-                {
-                    var nextLevelRepoActions = nextLevel
-                        .Where(x => x.action.Reference.Type == Pipelines.ActionSourceType.Repository)
-                        .Select(x => x.action)
-                        .ToList();
-                    await ResolveNewActionsAsync(executionContext, nextLevelRepoActions, resolvedDownloadInfos);
-
-                    foreach (var group in nextLevel.GroupBy(x => x.parentId))
-                    {
-                        var groupActions = group.Select(x => x.action).ToList();
-                        state = await PrepareActionsRecursiveAsync(executionContext, state, groupActions, resolvedDownloadInfos, depth + 1, group.Key);
-                    }
-                }
-
-                // Register pre/post steps after recursion so that HasPre/HasPost
-                // are correct (they depend on _cachedEmbeddedPreSteps/PostSteps
-                // being populated by the recursive calls above).
-                foreach (var action in repositoryActions)
-                {
-                    var repoAction = action.Reference as Pipelines.RepositoryPathReference;
-                    if (repoAction.RepositoryType != Pipelines.PipelineConstants.SelfAlias)
-                    {
-                        var definition = LoadAction(executionContext, action);
-                        if (definition.Data.Execution.HasPre)
-                        {
-                            Trace.Info($"Add 'pre' execution for {action.Id}");
-                            // Root Step
-                            if (depth < 1)
-                            {
-                                var actionRunner = HostContext.CreateService<IActionRunner>();
-                                actionRunner.Action = action;
-                                actionRunner.Stage = ActionRunStage.Pre;
-                                actionRunner.Condition = definition.Data.Execution.InitCondition;
-                                state.PreStepTracker[action.Id] = actionRunner;
-                            }
-                            // Embedded Step
-                            else
-                            {
-                                if (!_cachedEmbeddedPreSteps.ContainsKey(parentStepId))
-                                {
-                                    _cachedEmbeddedPreSteps[parentStepId] = new List<Pipelines.ActionStep>();
-                                }
-                                // Clone action so we can modify the condition without affecting the original
-                                var clonedAction = action.Clone() as Pipelines.ActionStep;
-                                clonedAction.Condition = definition.Data.Execution.InitCondition;
-                                _cachedEmbeddedPreSteps[parentStepId].Add(clonedAction);
-                            }
-                        }
-
-                        if (definition.Data.Execution.HasPost && depth > 0)
-                        {
-                            if (!_cachedEmbeddedPostSteps.ContainsKey(parentStepId))
-                            {
-                                // If we haven't done so already, add the parent to the post steps
-                                _cachedEmbeddedPostSteps[parentStepId] = new Stack<Pipelines.ActionStep>();
-                            }
-                            // Clone action so we can modify the condition without affecting the original
-                            var clonedAction = action.Clone() as Pipelines.ActionStep;
-                            clonedAction.Condition = definition.Data.Execution.CleanupCondition;
-                            _cachedEmbeddedPostSteps[parentStepId].Push(clonedAction);
-                        }
-                    }
-                    else if (depth > 0)
-                    {
-                        // if we're in a composite action and haven't loaded the local action yet
-                        // we assume it has a post step
-                        if (!_cachedEmbeddedPostSteps.ContainsKey(parentStepId))
-                        {
-                            // If we haven't done so already, add the parent to the post steps
-                            _cachedEmbeddedPostSteps[parentStepId] = new Stack<Pipelines.ActionStep>();
-                        }
-                        // Clone action so we can modify the condition without affecting the original
-                        var clonedAction = action.Clone() as Pipelines.ActionStep;
-                        _cachedEmbeddedPostSteps[parentStepId].Push(clonedAction);
-                    }
-                }
-            }
-
-            return state;
-        }
-
-        /// <summary>
-        /// Legacy (non-batched) action resolution. Each composite resolves its
-        /// sub-actions individually, with no cross-depth deduplication.
-        /// Used when the BatchActionResolution feature flag is disabled.
-        /// </summary>
-        private async Task<PrepareActionsState> PrepareActionsRecursiveLegacyAsync(IExecutionContext executionContext, PrepareActionsState state, IEnumerable<Pipelines.ActionStep> actions, Int32 depth = 0, Guid parentStepId = default(Guid))
+        private async Task<PrepareActionsState> PrepareActionsRecursiveAsync(IExecutionContext executionContext, PrepareActionsState state, IEnumerable<Pipelines.ActionStep> actions, Int32 depth = 0, Guid parentStepId = default(Guid))
         {
             ArgUtil.NotNull(executionContext, nameof(executionContext));
             if (depth > Constants.CompositeActionsMaxDepth)
@@ -449,7 +255,7 @@ namespace GitHub.Runner.Worker
                     }
                     else if (setupInfo != null && setupInfo.Steps != null && setupInfo.Steps.Count > 0)
                     {
-                        state = await PrepareActionsRecursiveLegacyAsync(executionContext, state, setupInfo.Steps, depth + 1, action.Id);
+                        state = await PrepareActionsRecursiveAsync(executionContext, state, setupInfo.Steps, depth + 1, action.Id);
                     }
                     var repoAction = action.Reference as Pipelines.RepositoryPathReference;
                     if (repoAction.RepositoryType != Pipelines.PipelineConstants.SelfAlias)
@@ -956,33 +762,6 @@ namespace GitHub.Runner.Worker
             return actionDownloadInfos.Actions;
         }
 
-        /// <summary>
-        /// Only resolves actions not already in resolvedDownloadInfos.
-        /// Results are cached for reuse at deeper recursion levels.
-        /// </summary>
-        private async Task ResolveNewActionsAsync(IExecutionContext executionContext, List<Pipelines.ActionStep> actions, Dictionary<string, WebApi.ActionDownloadInfo> resolvedDownloadInfos)
-        {
-            var actionsToResolve = new List<Pipelines.ActionStep>();
-            var pendingKeys = new HashSet<string>(StringComparer.Ordinal);
-            foreach (var action in actions)
-            {
-                var lookupKey = GetDownloadInfoLookupKey(action);
-                if (!string.IsNullOrEmpty(lookupKey) && !resolvedDownloadInfos.ContainsKey(lookupKey) && pendingKeys.Add(lookupKey))
-                {
-                    actionsToResolve.Add(action);
-                }
-            }
-
-            if (actionsToResolve.Count > 0)
-            {
-                var downloadInfos = await GetDownloadInfoAsync(executionContext, actionsToResolve);
-                foreach (var kvp in downloadInfos)
-                {
-                    resolvedDownloadInfos[kvp.Key] = kvp.Value;
-                }
-            }
-        }
-
         private async Task DownloadRepositoryActionAsync(IExecutionContext executionContext, WebApi.ActionDownloadInfo downloadInfo)
         {
             Trace.Entering();
@@ -1367,29 +1146,16 @@ namespace GitHub.Runner.Worker
             return $"{repositoryReference.Name}@{repositoryReference.Ref}";
         }
 
-        private AuthenticationHeaderValue CreateAuthHeader(IExecutionContext executionContext, string downloadUrl, string token)
+        private AuthenticationHeaderValue CreateAuthHeader(string token)
         {
             if (string.IsNullOrEmpty(token))
             {
                 return null;
             }
 
-            if (executionContext.Global.Variables.GetBoolean(Constants.Runner.Features.UseBearerTokenForCodeload) == true &&
-                Uri.TryCreate(downloadUrl, UriKind.Absolute, out var parsedUrl) &&
-                !string.IsNullOrEmpty(parsedUrl?.Host) &&
-                !string.IsNullOrEmpty(parsedUrl?.PathAndQuery) &&
-                (parsedUrl.Host.StartsWith("codeload.", StringComparison.OrdinalIgnoreCase) || parsedUrl.PathAndQuery.StartsWith("/_codeload/", StringComparison.OrdinalIgnoreCase)))
-            {
-                Trace.Info("Using Bearer token for action archive download directly to codeload.");
-                return new AuthenticationHeaderValue("Bearer", token);
-            }
-            else
-            {
-                Trace.Info("Using Basic token for action archive download.");
-                var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"x-access-token:{token}"));
-                HostContext.SecretMasker.AddValue(base64EncodingToken);
-                return new AuthenticationHeaderValue("Basic", base64EncodingToken);
-            }
+            var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"x-access-token:{token}"));
+            HostContext.SecretMasker.AddValue(base64EncodingToken);
+            return new AuthenticationHeaderValue("Basic", base64EncodingToken);
         }
 
         private async Task DownloadRepositoryArchive(IExecutionContext executionContext, string downloadUrl, string downloadAuthToken, string archiveFile)
@@ -1414,7 +1180,7 @@ namespace GitHub.Runner.Worker
                             using (var httpClientHandler = HostContext.CreateHttpClientHandler())
                             using (var httpClient = new HttpClient(httpClientHandler))
                             {
-                                httpClient.DefaultRequestHeaders.Authorization = CreateAuthHeader(executionContext, downloadUrl, downloadAuthToken);
+                                httpClient.DefaultRequestHeaders.Authorization = CreateAuthHeader(downloadAuthToken);
 
                                 httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
                                 using (var response = await httpClient.GetAsync(downloadUrl))

src/Runner.Worker/Dap/DapReplExecutor.cs

@@ -1,369 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.Runner.Common;
-using GitHub.Runner.Common.Util;
-using GitHub.Runner.Sdk;
-using GitHub.Runner.Worker.Handlers;
-
-namespace GitHub.Runner.Worker.Dap
-{
-    /// <summary>
-    /// Executes <see cref="RunCommand"/> objects in the job's runtime context.
-    ///
-    /// Mirrors the behavior of a normal workflow <c>run:</c> step as closely
-    /// as possible by reusing the runner's existing shell-resolution logic,
-    /// script fixup helpers, and process execution infrastructure.
-    ///
-    /// Output is streamed to the debugger via DAP <c>output</c> events with
-    /// secrets masked before emission.
-    /// </summary>
-    internal sealed class DapReplExecutor
-    {
-        private readonly IHostContext _hostContext;
-        private readonly Action<string, string> _sendOutput;
-        private readonly Tracing _trace;
-
-        public DapReplExecutor(IHostContext hostContext, Action<string, string> sendOutput)
-        {
-            _hostContext = hostContext ?? throw new ArgumentNullException(nameof(hostContext));
-            _sendOutput = sendOutput ?? throw new ArgumentNullException(nameof(sendOutput));
-            _trace = hostContext.GetTrace(nameof(DapReplExecutor));
-        }
-
-        /// <summary>
-        /// Executes a <see cref="RunCommand"/> and returns the exit code as a
-        /// formatted <see cref="EvaluateResponseBody"/>.
-        /// </summary>
-        public async Task<EvaluateResponseBody> ExecuteRunCommandAsync(
-            RunCommand command,
-            IExecutionContext context,
-            CancellationToken cancellationToken)
-        {
-            if (context == null)
-            {
-                return ErrorResult("No execution context available. The debugger must be paused at a step to run commands.");
-            }
-
-            try
-            {
-                return await ExecuteScriptAsync(command, context, cancellationToken);
-            }
-            catch (Exception ex)
-            {
-                _trace.Error($"REPL run command failed ({ex.GetType().Name})");
-                var maskedError = _hostContext.SecretMasker.MaskSecrets(ex.Message);
-                return ErrorResult($"Command failed: {maskedError}");
-            }
-        }
-
-        private async Task<EvaluateResponseBody> ExecuteScriptAsync(
-            RunCommand command,
-            IExecutionContext context,
-            CancellationToken cancellationToken)
-        {
-            // 1. Resolve shell — same logic as ScriptHandler
-            string shellCommand;
-            string argFormat;
-
-            if (!string.IsNullOrEmpty(command.Shell))
-            {
-                // Explicit shell from the DSL
-                var parsed = ScriptHandlerHelpers.ParseShellOptionString(command.Shell);
-                shellCommand = parsed.shellCommand;
-                argFormat = string.IsNullOrEmpty(parsed.shellArgs)
-                    ? ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand)
-                    : parsed.shellArgs;
-            }
-            else
-            {
-                // Default shell — mirrors ScriptHandler platform defaults
-                shellCommand = ResolveDefaultShell(context);
-                argFormat = ScriptHandlerHelpers.GetScriptArgumentsFormat(shellCommand);
-            }
-
-            _trace.Info("Resolved REPL shell");
-
-            // 2. Expand ${{ }} expressions in the script body, just like
-            //    ActionRunner evaluates step inputs before ScriptHandler sees them
-            var contents = ExpandExpressions(command.Script, context);
-            contents = ScriptHandlerHelpers.FixUpScriptContents(shellCommand, contents);
-
-            // Write to a temp file (same pattern as ScriptHandler)
-            var extension = ScriptHandlerHelpers.GetScriptFileExtension(shellCommand);
-            var scriptFilePath = Path.Combine(
-                _hostContext.GetDirectory(WellKnownDirectory.Temp),
-                $"dap_repl_{Guid.NewGuid()}{extension}");
-
-            Encoding encoding = new UTF8Encoding(false);
-#if OS_WINDOWS
-            contents = contents.Replace("\r\n", "\n").Replace("\n", "\r\n");
-            encoding = Console.InputEncoding.CodePage != 65001
-                ? Console.InputEncoding
-                : encoding;
-#endif
-            File.WriteAllText(scriptFilePath, contents, encoding);
-
-            try
-            {
-                // 3. Format arguments with script path
-                var resolvedPath = scriptFilePath.Replace("\"", "\\\"");
-                if (string.IsNullOrEmpty(argFormat) || !argFormat.Contains("{0}"))
-                {
-                    return ErrorResult($"Invalid shell option '{shellCommand}'. Shell must be a valid built-in (bash, sh, cmd, powershell, pwsh) or a format string containing '{{0}}'");
-                }
-                var arguments = string.Format(argFormat, resolvedPath);
-
-                // 4. Resolve shell command path
-                string prependPath = string.Join(
-                    Path.PathSeparator.ToString(),
-                    Enumerable.Reverse(context.Global.PrependPath));
-                var commandPath = WhichUtil.Which(shellCommand, false, _trace, prependPath)
-                    ?? shellCommand;
-
-                // 5. Build environment — merge from execution context like a real step
-                var environment = BuildEnvironment(context, command.Env);
-
-                // 6. Resolve working directory
-                var workingDirectory = command.WorkingDirectory;
-                if (string.IsNullOrEmpty(workingDirectory))
-                {
-                    var githubContext = context.ExpressionValues.TryGetValue("github", out var gh)
-                        ? gh as DictionaryContextData
-                        : null;
-                    var workspace = githubContext?.TryGetValue("workspace", out var ws) == true
-                        ? (ws as StringContextData)?.Value
-                        : null;
-                    workingDirectory = workspace ?? _hostContext.GetDirectory(WellKnownDirectory.Work);
-                }
-
-                _trace.Info("Executing REPL command");
-
-                // Stream execution info to debugger
-                SendOutput("console", $"$ {shellCommand} {command.Script.Substring(0, Math.Min(command.Script.Length, 80))}{(command.Script.Length > 80 ? "..." : "")}\n");
-
-                // 7. Execute via IProcessInvoker (same as DefaultStepHost)
-                int exitCode;
-                using (var processInvoker = _hostContext.CreateService<IProcessInvoker>())
-                {
-                    processInvoker.OutputDataReceived += (sender, args) =>
-                    {
-                        if (!string.IsNullOrEmpty(args.Data))
-                        {
-                            var masked = _hostContext.SecretMasker.MaskSecrets(args.Data);
-                            SendOutput("stdout", masked + "\n");
-                        }
-                    };
-
-                    processInvoker.ErrorDataReceived += (sender, args) =>
-                    {
-                        if (!string.IsNullOrEmpty(args.Data))
-                        {
-                            var masked = _hostContext.SecretMasker.MaskSecrets(args.Data);
-                            SendOutput("stderr", masked + "\n");
-                        }
-                    };
-
-                    exitCode = await processInvoker.ExecuteAsync(
-                        workingDirectory: workingDirectory,
-                        fileName: commandPath,
-                        arguments: arguments,
-                        environment: environment,
-                        requireExitCodeZero: false,
-                        outputEncoding: null,
-                        killProcessOnCancel: true,
-                        cancellationToken: cancellationToken);
-                }
-
-                _trace.Info($"REPL command exited with code {exitCode}");
-
-                // 8. Return only the exit code summary (output was already streamed)
-                return new EvaluateResponseBody
-                {
-                    Result = exitCode == 0 ? $"(exit code: {exitCode})" : $"Process completed with exit code {exitCode}.",
-                    Type = exitCode == 0 ? "string" : "error",
-                    VariablesReference = 0
-                };
-            }
-            finally
-            {
-                // Clean up temp script file
-                try { File.Delete(scriptFilePath); }
-                catch { /* best effort */ }
-            }
-        }
-
-        /// <summary>
-        /// Expands <c>${{ }}</c> expressions in the input string using the
-        /// runner's template evaluator — the same evaluation path that processes
-        /// step inputs before <see cref="ScriptHandler"/> runs them.
-        ///
-        /// Each <c>${{ expr }}</c> occurrence is individually evaluated and
-        /// replaced with its masked string result, mirroring the semantics of
-        /// expression interpolation in a workflow <c>run:</c> step body.
-        /// </summary>
-        internal string ExpandExpressions(string input, IExecutionContext context)
-        {
-            if (string.IsNullOrEmpty(input) || !input.Contains("${{"))
-            {
-                return input ?? string.Empty;
-            }
-
-            var result = new StringBuilder();
-            int pos = 0;
-
-            while (pos < input.Length)
-            {
-                var start = input.IndexOf("${{", pos, StringComparison.Ordinal);
-                if (start < 0)
-                {
-                    result.Append(input, pos, input.Length - pos);
-                    break;
-                }
-
-                // Append the literal text before the expression
-                result.Append(input, pos, start - pos);
-
-                var end = input.IndexOf("}}", start + 3, StringComparison.Ordinal);
-                if (end < 0)
-                {
-                    // Unterminated expression — keep literal
-                    result.Append(input, start, input.Length - start);
-                    break;
-                }
-
-                var expr = input.Substring(start + 3, end - start - 3).Trim();
-                end += 2; // skip past "}}"
-
-                // Evaluate the expression
-                try
-                {
-                    var templateEvaluator = context.ToPipelineTemplateEvaluator();
-                    var token = new GitHub.DistributedTask.ObjectTemplating.Tokens.BasicExpressionToken(
-                        null, null, null, expr);
-                    var evaluated = templateEvaluator.EvaluateStepDisplayName(
-                        token,
-                        context.ExpressionValues,
-                        context.ExpressionFunctions);
-                    result.Append(_hostContext.SecretMasker.MaskSecrets(evaluated ?? string.Empty));
-                }
-                catch (Exception ex)
-                {
-                    _trace.Warning($"Expression expansion failed ({ex.GetType().Name})");
-                    // Keep the original expression literal on failure
-                    result.Append(input, start, end - start);
-                }
-
-                pos = end;
-            }
-
-            return result.ToString();
-        }
-
-        /// <summary>
-        /// Resolves the default shell the same way <see cref="ScriptHandler"/>
-        /// does: check job defaults, then fall back to platform default.
-        /// </summary>
-        internal string ResolveDefaultShell(IExecutionContext context)
-        {
-            // Check job defaults
-            if (context.Global?.JobDefaults != null &&
-                context.Global.JobDefaults.TryGetValue("run", out var runDefaults) &&
-                runDefaults.TryGetValue("shell", out var defaultShell) &&
-                !string.IsNullOrEmpty(defaultShell))
-            {
-                _trace.Info("Using job default shell");
-                return defaultShell;
-            }
-
-#if OS_WINDOWS
-            string prependPath = string.Join(
-                Path.PathSeparator.ToString(),
-                context.Global?.PrependPath != null ? Enumerable.Reverse(context.Global.PrependPath) : Array.Empty<string>());
-            var pwshPath = WhichUtil.Which("pwsh", false, _trace, prependPath);
-            return !string.IsNullOrEmpty(pwshPath) ? "pwsh" : "powershell";
-#else
-            return "sh";
-#endif
-        }
-
-        /// <summary>
-        /// Merges the job context environment with any REPL-specific overrides.
-        /// </summary>
-        internal Dictionary<string, string> BuildEnvironment(
-            IExecutionContext context,
-            Dictionary<string, string> replEnv)
-        {
-            var env = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer);
-
-            // Pull environment from the execution context (same as ActionRunner)
-            if (context.ExpressionValues.TryGetValue("env", out var envData))
-            {
-                if (envData is DictionaryContextData dictEnv)
-                {
-                    foreach (var pair in dictEnv)
-                    {
-                        if (pair.Value is StringContextData str)
-                        {
-                            env[pair.Key] = str.Value;
-                        }
-                    }
-                }
-                else if (envData is CaseSensitiveDictionaryContextData csEnv)
-                {
-                    foreach (var pair in csEnv)
-                    {
-                        if (pair.Value is StringContextData str)
-                        {
-                            env[pair.Key] = str.Value;
-                        }
-                    }
-                }
-            }
-
-            // Expose runtime context variables to the environment (GITHUB_*, RUNNER_*, etc.)
-            foreach (var ctxPair in context.ExpressionValues)
-            {
-                if (ctxPair.Value is IEnvironmentContextData runtimeContext && runtimeContext != null)
-                {
-                    foreach (var rtEnv in runtimeContext.GetRuntimeEnvironmentVariables())
-                    {
-                        env[rtEnv.Key] = rtEnv.Value;
-                    }
-                }
-            }
-
-            // Apply REPL-specific overrides last (so they win),
-            // expanding any ${{ }} expressions in the values
-            if (replEnv != null)
-            {
-                foreach (var pair in replEnv)
-                {
-                    env[pair.Key] = ExpandExpressions(pair.Value, context);
-                }
-            }
-
-            return env;
-        }
-
-        private void SendOutput(string category, string text)
-        {
-            _sendOutput(category, text);
-        }
-
-        private static EvaluateResponseBody ErrorResult(string message)
-        {
-            return new EvaluateResponseBody
-            {
-                Result = message,
-                Type = "error",
-                VariablesReference = 0
-            };
-        }
-    }
-}

src/Runner.Worker/Dap/DapReplParser.cs

@@ -1,411 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace GitHub.Runner.Worker.Dap
-{
-    /// <summary>
-    /// Base type for all REPL DSL commands.
-    /// </summary>
-    internal abstract class DapReplCommand
-    {
-    }
-
-    /// <summary>
-    /// <c>help</c> or <c>help("run")</c>
-    /// </summary>
-    internal sealed class HelpCommand : DapReplCommand
-    {
-        public string Topic { get; set; }
-    }
-
-    /// <summary>
-    /// <c>run("echo hello")</c> or
-    /// <c>run("echo hello", shell: "bash", env: { FOO: "bar" }, working_directory: "/tmp")</c>
-    /// </summary>
-    internal sealed class RunCommand : DapReplCommand
-    {
-        public string Script { get; set; }
-        public string Shell { get; set; }
-        public Dictionary<string, string> Env { get; set; }
-        public string WorkingDirectory { get; set; }
-    }
-
-    /// <summary>
-    /// Parses REPL input into typed <see cref="DapReplCommand"/> objects.
-    ///
-    /// Grammar (intentionally minimal — extend as the DSL grows):
-    /// <code>
-    ///   help                                → HelpCommand { Topic = null }
-    ///   help("run")                         → HelpCommand { Topic = "run" }
-    ///   run("script body")                  → RunCommand  { Script = "script body" }
-    ///   run("script", shell: "bash")        → RunCommand  { Shell = "bash" }
-    ///   run("script", env: { K: "V" })      → RunCommand  { Env = { K → V } }
-    ///   run("script", working_directory: "p")→ RunCommand  { WorkingDirectory = "p" }
-    /// </code>
-    ///
-    /// Parsing is intentionally hand-rolled rather than regex-based so it can
-    /// handle nested braces, quoted strings with escapes, and grow to support
-    /// future commands without accumulating regex complexity.
-    /// </summary>
-    internal static class DapReplParser
-    {
-        /// <summary>
-        /// Attempts to parse REPL input into a command. Returns null if the
-        /// input does not match any known DSL command (i.e. it should be
-        /// treated as an expression instead).
-        /// </summary>
-        internal static DapReplCommand TryParse(string input, out string error)
-        {
-            error = null;
-            if (string.IsNullOrWhiteSpace(input))
-            {
-                return null;
-            }
-
-            var trimmed = input.Trim();
-
-            // help / help("topic")
-            if (trimmed.Equals("help", StringComparison.OrdinalIgnoreCase) ||
-                trimmed.StartsWith("help(", StringComparison.OrdinalIgnoreCase))
-            {
-                return ParseHelp(trimmed, out error);
-            }
-
-            // run("...")
-            if (trimmed.StartsWith("run(", StringComparison.OrdinalIgnoreCase))
-            {
-                return ParseRun(trimmed, out error);
-            }
-
-            // Not a DSL command
-            return null;
-        }
-
-        internal static string GetGeneralHelp()
-        {
-            return """
-                Actions Debug Console
-
-                Commands:
-                  help                  Show this help
-                  help("run")           Show help for the run command
-                  run("script")         Execute a script (like a workflow run step)
-
-                Anything else is evaluated as a GitHub Actions expression.
-                  Example: github.repository
-                  Example: ${{ github.event_name }}
-
-                """;
-        }
-
-        internal static string GetRunHelp()
-        {
-            return """
-                run command — execute a script in the job context
-
-                Usage:
-                  run("echo hello")
-                  run("echo $FOO", shell: "bash")
-                  run("echo $FOO", env: { FOO: "bar" })
-                  run("ls", working_directory: "/tmp")
-                  run("echo $X", shell: "bash", env: { X: "1" }, working_directory: "/tmp")
-
-                Options:
-                  shell:             Shell to use (default: job default, e.g. bash)
-                  env:               Extra environment variables as { KEY: "value" }
-                  working_directory:  Working directory for the command
-
-                Behavior:
-                  - Equivalent to a workflow `run:` step
-                  - Expressions in the script body are expanded (${{ ... }})
-                  - Output is streamed in real time and secrets are masked
-
-                """;
-        }
-
-        #region Parsers
-
-        private static HelpCommand ParseHelp(string input, out string error)
-        {
-            error = null;
-            if (input.Equals("help", StringComparison.OrdinalIgnoreCase))
-            {
-                return new HelpCommand();
-            }
-
-            // help("topic")
-            var inner = ExtractParenthesizedArgs(input, "help", out error);
-            if (error != null) return null;
-
-            var topic = ExtractQuotedString(inner.Trim(), out error);
-            if (error != null) return null;
-
-            return new HelpCommand { Topic = topic };
-        }
-
-        private static RunCommand ParseRun(string input, out string error)
-        {
-            error = null;
-
-            var inner = ExtractParenthesizedArgs(input, "run", out error);
-            if (error != null) return null;
-
-            // Split into argument list respecting quotes and braces
-            var args = SplitArguments(inner, out error);
-            if (error != null) return null;
-            if (args.Count == 0)
-            {
-                error = "run() requires a script argument. Example: run(\"echo hello\")";
-                return null;
-            }
-
-            // First arg must be the script body (a quoted string)
-            var script = ExtractQuotedString(args[0].Trim(), out error);
-            if (error != null)
-            {
-                error = $"First argument to run() must be a quoted string. {error}";
-                return null;
-            }
-
-            var cmd = new RunCommand { Script = script };
-
-            // Parse remaining keyword arguments
-            for (int i = 1; i < args.Count; i++)
-            {
-                var kv = args[i].Trim();
-                var colonIdx = kv.IndexOf(':');
-                if (colonIdx <= 0)
-                {
-                    error = $"Expected keyword argument (e.g. shell: \"bash\"), got: {kv}";
-                    return null;
-                }
-
-                var key = kv.Substring(0, colonIdx).Trim();
-                var value = kv.Substring(colonIdx + 1).Trim();
-
-                switch (key.ToLowerInvariant())
-                {
-                    case "shell":
-                        cmd.Shell = ExtractQuotedString(value, out error);
-                        if (error != null) { error = $"shell: {error}"; return null; }
-                        break;
-
-                    case "working_directory":
-                        cmd.WorkingDirectory = ExtractQuotedString(value, out error);
-                        if (error != null) { error = $"working_directory: {error}"; return null; }
-                        break;
-
-                    case "env":
-                        cmd.Env = ParseEnvBlock(value, out error);
-                        if (error != null) { error = $"env: {error}"; return null; }
-                        break;
-
-                    default:
-                        error = $"Unknown option: {key}. Valid options: shell, env, working_directory";
-                        return null;
-                }
-            }
-
-            return cmd;
-        }
-
-        #endregion
-
-        #region Low-level parsing helpers
-
-        /// <summary>
-        /// Given "cmd(...)" returns the inner content between the outer parens.
-        /// </summary>
-        private static string ExtractParenthesizedArgs(string input, string prefix, out string error)
-        {
-            error = null;
-            var start = prefix.Length; // skip "cmd"
-            if (start >= input.Length || input[start] != '(')
-            {
-                error = $"Expected '(' after {prefix}";
-                return null;
-            }
-
-            if (input[input.Length - 1] != ')')
-            {
-                error = $"Expected ')' at end of {prefix}(...)";
-                return null;
-            }
-
-            return input.Substring(start + 1, input.Length - start - 2);
-        }
-
-        /// <summary>
-        /// Extracts a double-quoted string value, handling escaped quotes.
-        /// </summary>
-        internal static string ExtractQuotedString(string input, out string error)
-        {
-            error = null;
-            if (string.IsNullOrEmpty(input))
-            {
-                error = "Expected a quoted string, got empty input";
-                return null;
-            }
-
-            if (input[0] != '"')
-            {
-                error = $"Expected a quoted string starting with \", got: {Truncate(input, 40)}";
-                return null;
-            }
-
-            var sb = new StringBuilder();
-            for (int i = 1; i < input.Length; i++)
-            {
-                if (input[i] == '\\' && i + 1 < input.Length)
-                {
-                    sb.Append(input[i + 1]);
-                    i++;
-                }
-                else if (input[i] == '"')
-                {
-                    // Check nothing meaningful follows the closing quote
-                    var rest = input.Substring(i + 1).Trim();
-                    if (rest.Length > 0)
-                    {
-                        error = $"Unexpected content after closing quote: {Truncate(rest, 40)}";
-                        return null;
-                    }
-                    return sb.ToString();
-                }
-                else
-                {
-                    sb.Append(input[i]);
-                }
-            }
-
-            error = "Unterminated string (missing closing \")";
-            return null;
-        }
-
-        /// <summary>
-        /// Splits a comma-separated argument list, respecting quoted strings
-        /// and nested braces so that <c>"a, b", env: { K: "V, W" }</c> is
-        /// correctly split into two arguments.
-        /// </summary>
-        internal static List<string> SplitArguments(string input, out string error)
-        {
-            error = null;
-            var result = new List<string>();
-            var current = new StringBuilder();
-            int depth = 0;
-            bool inQuote = false;
-
-            for (int i = 0; i < input.Length; i++)
-            {
-                var ch = input[i];
-
-                if (ch == '\\' && inQuote && i + 1 < input.Length)
-                {
-                    current.Append(ch);
-                    current.Append(input[++i]);
-                    continue;
-                }
-
-                if (ch == '"')
-                {
-                    inQuote = !inQuote;
-                    current.Append(ch);
-                    continue;
-                }
-
-                if (!inQuote)
-                {
-                    if (ch == '{')
-                    {
-                        depth++;
-                        current.Append(ch);
-                        continue;
-                    }
-                    if (ch == '}')
-                    {
-                        depth--;
-                        current.Append(ch);
-                        continue;
-                    }
-                    if (ch == ',' && depth == 0)
-                    {
-                        result.Add(current.ToString());
-                        current.Clear();
-                        continue;
-                    }
-                }
-
-                current.Append(ch);
-            }
-
-            if (inQuote)
-            {
-                error = "Unterminated string in arguments";
-                return null;
-            }
-            if (depth != 0)
-            {
-                error = "Unmatched braces in arguments";
-                return null;
-            }
-
-            if (current.Length > 0)
-            {
-                result.Add(current.ToString());
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Parses <c>{ KEY: "value", KEY2: "value2" }</c> into a dictionary.
-        /// </summary>
-        internal static Dictionary<string, string> ParseEnvBlock(string input, out string error)
-        {
-            error = null;
-            var trimmed = input.Trim();
-            if (!trimmed.StartsWith("{") || !trimmed.EndsWith("}"))
-            {
-                error = "Expected env block in the form { KEY: \"value\" }";
-                return null;
-            }
-
-            var inner = trimmed.Substring(1, trimmed.Length - 2).Trim();
-            if (string.IsNullOrEmpty(inner))
-            {
-                return new Dictionary<string, string>();
-            }
-
-            var pairs = SplitArguments(inner, out error);
-            if (error != null) return null;
-
-            var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-            foreach (var pair in pairs)
-            {
-                var colonIdx = pair.IndexOf(':');
-                if (colonIdx <= 0)
-                {
-                    error = $"Expected KEY: \"value\" pair, got: {Truncate(pair.Trim(), 40)}";
-                    return null;
-                }
-
-                var key = pair.Substring(0, colonIdx).Trim();
-                var val = ExtractQuotedString(pair.Substring(colonIdx + 1).Trim(), out error);
-                if (error != null) return null;
-
-                result[key] = val;
-            }
-
-            return result;
-        }
-
-        private static string Truncate(string value, int maxLength)
-        {
-            if (value == null) return "(null)";
-            return value.Length <= maxLength ? value : value.Substring(0, maxLength) + "...";
-        }
-
-        #endregion
-    }
-}

src/Runner.Worker/Dap/DapVariableProvider.cs

@@ -1,373 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using GitHub.DistributedTask.Logging;
-using GitHub.DistributedTask.ObjectTemplating.Tokens;
-using GitHub.DistributedTask.Pipelines.ContextData;
-
-namespace GitHub.Runner.Worker.Dap
-{
-    /// <summary>
-    /// Maps runner execution context data to DAP scopes and variables.
-    ///
-    /// This is the single point where runner context values are materialized
-    /// for the debugger. All values pass through the runner's existing
-    /// <see cref="GitHub.DistributedTask.Logging.ISecretMasker"/> so the DAP
-    /// surface never exposes anything beyond what a normal CI log would show.
-    ///
-    /// The secrets scope is intentionally opaque: keys are visible but every
-    /// value is replaced with a constant redaction marker.
-    ///
-    /// Designed to be reusable by future DAP features (evaluate, hover, REPL)
-    /// so that masking policy is never duplicated.
-    /// </summary>
-    internal sealed class DapVariableProvider
-    {
-        // Well-known scope names that map to top-level expression contexts.
-        // Order matters: the index determines the stable variablesReference ID.
-        private static readonly string[] _scopeNames =
-        {
-            "github", "env", "runner", "job", "steps",
-            "secrets", "inputs", "vars", "matrix", "needs"
-        };
-
-        // Scope references occupy the range [1, ScopeReferenceMax].
-        private const int _scopeReferenceBase = 1;
-        private const int _scopeReferenceMax = 100;
-
-        // Dynamic (nested) variable references start above the scope range.
-        private const int _dynamicReferenceBase = 101;
-
-        private const string _redactedValue = "***";
-
-        private readonly ISecretMasker _secretMasker;
-
-        // Maps dynamic variable reference IDs to the backing data and its
-        // dot-separated path (e.g. "github.event.pull_request").
-        private readonly Dictionary<int, (PipelineContextData Data, string Path)> _variableReferences = new();
-        private int _nextVariableReference = _dynamicReferenceBase;
-
-        public DapVariableProvider(ISecretMasker secretMasker)
-        {
-            _secretMasker = secretMasker ?? throw new ArgumentNullException(nameof(secretMasker));
-        }
-
-        /// <summary>
-        /// Clears all dynamic variable references.
-        /// Call this whenever the paused execution context changes (e.g. new step)
-        /// so that stale nested references are not served to the client.
-        /// </summary>
-        public void Reset()
-        {
-            _variableReferences.Clear();
-            _nextVariableReference = _dynamicReferenceBase;
-        }
-
-        /// <summary>
-        /// Returns the list of DAP scopes for the given execution context.
-        /// Each scope corresponds to a well-known runner expression context
-        /// (github, env, secrets, …) and carries a stable variablesReference
-        /// that the client can use to drill into variables.
-        /// </summary>
-        public List<Scope> GetScopes(IExecutionContext context)
-        {
-            var scopes = new List<Scope>();
-
-            if (context?.ExpressionValues == null)
-            {
-                return scopes;
-            }
-
-            for (int i = 0; i < _scopeNames.Length; i++)
-            {
-                var scopeName = _scopeNames[i];
-                if (!context.ExpressionValues.TryGetValue(scopeName, out var value) || value == null)
-                {
-                    continue;
-                }
-
-                var scope = new Scope
-                {
-                    Name = scopeName,
-                    VariablesReference = _scopeReferenceBase + i,
-                    Expensive = false,
-                    PresentationHint = scopeName == "secrets" ? "registers" : null
-                };
-
-                if (value is DictionaryContextData dict)
-                {
-                    scope.NamedVariables = dict.Count;
-                }
-                else if (value is CaseSensitiveDictionaryContextData csDict)
-                {
-                    scope.NamedVariables = csDict.Count;
-                }
-
-                scopes.Add(scope);
-            }
-
-            return scopes;
-        }
-
-        /// <summary>
-        /// Returns the child variables for a given variablesReference.
-        /// The reference may point at a top-level scope (1–100) or a
-        /// dynamically registered nested container (101+).
-        /// </summary>
-        public List<Variable> GetVariables(IExecutionContext context, int variablesReference)
-        {
-            var variables = new List<Variable>();
-
-            if (context?.ExpressionValues == null)
-            {
-                return variables;
-            }
-
-            PipelineContextData data = null;
-            string basePath = null;
-            bool isSecretsScope = false;
-
-            if (variablesReference >= _scopeReferenceBase && variablesReference <= _scopeReferenceMax)
-            {
-                var scopeIndex = variablesReference - _scopeReferenceBase;
-                if (scopeIndex < _scopeNames.Length)
-                {
-                    var scopeName = _scopeNames[scopeIndex];
-                    isSecretsScope = scopeName == "secrets";
-                    if (context.ExpressionValues.TryGetValue(scopeName, out data))
-                    {
-                        basePath = scopeName;
-                    }
-                }
-            }
-            else if (_variableReferences.TryGetValue(variablesReference, out var refData))
-            {
-                data = refData.Data;
-                basePath = refData.Path;
-                isSecretsScope = basePath?.StartsWith("secrets", StringComparison.OrdinalIgnoreCase) == true;
-            }
-
-            if (data == null)
-            {
-                return variables;
-            }
-
-            ConvertToVariables(data, basePath, isSecretsScope, variables);
-            return variables;
-        }
-
-        /// <summary>
-        /// Evaluates a GitHub Actions expression (e.g. "github.repository",
-        /// "${{ github.event_name }}") in the context of the current step and
-        /// returns a masked result suitable for the DAP evaluate response.
-        ///
-        /// Uses the runner's standard <see cref="GitHub.DistributedTask.Pipelines.ObjectTemplating.IPipelineTemplateEvaluator"/>
-        /// so the full expression language is available (functions, operators,
-        /// context access).
-        /// </summary>
-        public EvaluateResponseBody EvaluateExpression(string expression, IExecutionContext context)
-        {
-            if (context?.ExpressionValues == null)
-            {
-                return new EvaluateResponseBody
-                {
-                    Result = "(no execution context available)",
-                    Type = "string",
-                    VariablesReference = 0
-                };
-            }
-
-            // Strip ${{ }} wrapper if present
-            var expr = expression?.Trim() ?? string.Empty;
-            if (expr.StartsWith("${{") && expr.EndsWith("}}"))
-            {
-                expr = expr.Substring(3, expr.Length - 5).Trim();
-            }
-
-            if (string.IsNullOrEmpty(expr))
-            {
-                return new EvaluateResponseBody
-                {
-                    Result = string.Empty,
-                    Type = "string",
-                    VariablesReference = 0
-                };
-            }
-
-            try
-            {
-                var templateEvaluator = context.ToPipelineTemplateEvaluator();
-                var token = new BasicExpressionToken(null, null, null, expr);
-
-                var result = templateEvaluator.EvaluateStepDisplayName(
-                    token,
-                    context.ExpressionValues,
-                    context.ExpressionFunctions);
-
-                result = _secretMasker.MaskSecrets(result ?? "null");
-
-                return new EvaluateResponseBody
-                {
-                    Result = result,
-                    Type = InferResultType(result),
-                    VariablesReference = 0
-                };
-            }
-            catch (Exception ex)
-            {
-                var errorMessage = _secretMasker.MaskSecrets($"Evaluation error: {ex.Message}");
-                return new EvaluateResponseBody
-                {
-                    Result = errorMessage,
-                    Type = "string",
-                    VariablesReference = 0
-                };
-            }
-        }
-
-        /// <summary>
-        /// Infers a simple DAP type hint from the string representation of a result.
-        /// </summary>
-        internal static string InferResultType(string value)
-        {
-            value = value?.ToLower();
-            if (value == null || value == "null")
-                return "null";
-            if (value == "true" || value == "false")
-                return "boolean";
-            if (double.TryParse(value, NumberStyles.Any,
-                    CultureInfo.InvariantCulture, out _))
-                return "number";
-            if (value.StartsWith("{") || value.StartsWith("["))
-                return "object";
-            return "string";
-        }
-
-        #region Private helpers
-
-        private void ConvertToVariables(
-            PipelineContextData data,
-            string basePath,
-            bool isSecretsScope,
-            List<Variable> variables)
-        {
-            switch (data)
-            {
-                case DictionaryContextData dict:
-                    foreach (var pair in dict)
-                    {
-                        variables.Add(CreateVariable(pair.Key, pair.Value, basePath, isSecretsScope));
-                    }
-                    break;
-
-                case CaseSensitiveDictionaryContextData csDict:
-                    foreach (var pair in csDict)
-                    {
-                        variables.Add(CreateVariable(pair.Key, pair.Value, basePath, isSecretsScope));
-                    }
-                    break;
-
-                case ArrayContextData array:
-                    for (int i = 0; i < array.Count; i++)
-                    {
-                        var variable = CreateVariable($"[{i}]", array[i], basePath, isSecretsScope);
-                        variables.Add(variable);
-                    }
-                    break;
-            }
-        }
-
-        private Variable CreateVariable(
-            string name,
-            PipelineContextData value,
-            string basePath,
-            bool isSecretsScope)
-        {
-            var childPath = string.IsNullOrEmpty(basePath) ? name : $"{basePath}.{name}";
-            var variable = new Variable
-            {
-                Name = name,
-                EvaluateName = $"${{{{ {childPath} }}}}"
-            };
-
-            // Secrets scope: redact ALL values regardless of underlying type.
-            // Keys are visible but values are always replaced with the
-            // redaction marker, and nested containers are not drillable.
-            if (isSecretsScope)
-            {
-                variable.Value = _redactedValue;
-                variable.Type = "string";
-                variable.VariablesReference = 0;
-                return variable;
-            }
-
-            if (value == null)
-            {
-                variable.Value = "null";
-                variable.Type = "null";
-                variable.VariablesReference = 0;
-                return variable;
-            }
-
-            switch (value)
-            {
-                case StringContextData str:
-                    variable.Value = _secretMasker.MaskSecrets(str.Value);
-                    variable.Type = "string";
-                    variable.VariablesReference = 0;
-                    break;
-
-                case NumberContextData num:
-                    variable.Value = _secretMasker.MaskSecrets(num.Value.ToString("G15", CultureInfo.InvariantCulture));
-                    variable.Type = "number";
-                    variable.VariablesReference = 0;
-                    break;
-
-                case BooleanContextData boolVal:
-                    variable.Value = boolVal.Value ? "true" : "false";
-                    variable.Type = "boolean";
-                    variable.VariablesReference = 0;
-                    break;
-
-                case DictionaryContextData dict:
-                    variable.Value = $"Object ({dict.Count} properties)";
-                    variable.Type = "object";
-                    variable.VariablesReference = RegisterVariableReference(dict, childPath);
-                    variable.NamedVariables = dict.Count;
-                    break;
-
-                case CaseSensitiveDictionaryContextData csDict:
-                    variable.Value = $"Object ({csDict.Count} properties)";
-                    variable.Type = "object";
-                    variable.VariablesReference = RegisterVariableReference(csDict, childPath);
-                    variable.NamedVariables = csDict.Count;
-                    break;
-
-                case ArrayContextData array:
-                    variable.Value = $"Array ({array.Count} items)";
-                    variable.Type = "array";
-                    variable.VariablesReference = RegisterVariableReference(array, childPath);
-                    variable.IndexedVariables = array.Count;
-                    break;
-
-                default:
-                    var rawValue = value.ToJToken()?.ToString() ?? "unknown";
-                    variable.Value = _secretMasker.MaskSecrets(rawValue);
-                    variable.Type = value.GetType().Name;
-                    variable.VariablesReference = 0;
-                    break;
-            }
-
-            return variable;
-        }
-
-        private int RegisterVariableReference(PipelineContextData data, string path)
-        {
-            var reference = _nextVariableReference++;
-            _variableReferences[reference] = (data, path);
-            return reference;
-        }
-
-        #endregion
-    }
-}

src/Runner.Worker/Dap/DebuggerConfig.cs

@@ -1,33 +0,0 @@
-using GitHub.DistributedTask.Pipelines;
-
-namespace GitHub.Runner.Worker.Dap
-{
-    /// <summary>
-    /// Consolidated runtime configuration for the job debugger.
-    /// Populated once from the acquire response and owned by <see cref="GlobalContext"/>.
-    /// </summary>
-    public sealed class DebuggerConfig
-    {
-        public DebuggerConfig(bool enabled, DebuggerTunnelInfo tunnel)
-        {
-            Enabled = enabled;
-            Tunnel = tunnel;
-        }
-
-        /// <summary>Whether the debugger is enabled for this job.</summary>
-        public bool Enabled { get; }
-
-        /// <summary>
-        /// Dev Tunnel details for remote debugging.
-        /// Required when <see cref="Enabled"/> is true.
-        /// </summary>
-        public DebuggerTunnelInfo Tunnel { get; }
-
-        /// <summary>Whether the tunnel configuration is complete and valid.</summary>
-        public bool HasValidTunnel => Tunnel != null
-            && !string.IsNullOrEmpty(Tunnel.TunnelId)
-            && !string.IsNullOrEmpty(Tunnel.ClusterId)
-            && !string.IsNullOrEmpty(Tunnel.HostToken)
-            && Tunnel.Port >= 1024 && Tunnel.Port <= 65535;
-    }
-}

src/Runner.Worker/Dap/IDapDebugger.cs

@@ -1,26 +0,0 @@
-using System.Threading.Tasks;
-using GitHub.Runner.Common;
-
-namespace GitHub.Runner.Worker.Dap
-{
-    public enum DapSessionState
-    {
-        NotStarted,
-        WaitingForConnection,
-        Initializing,
-        Ready,
-        Paused,
-        Running,
-        Terminated
-    }
-
-    [ServiceLocator(Default = typeof(DapDebugger))]
-    public interface IDapDebugger : IRunnerService
-    {
-        Task StartAsync(IExecutionContext jobContext);
-        Task WaitUntilReadyAsync();
-        Task OnStepStartingAsync(IStep step);
-        void OnStepCompleted(IStep step);
-        Task OnJobCompletedAsync();
-    }
-}

src/Runner.Worker/ExecutionContext.cs

@@ -892,12 +892,15 @@ namespace GitHub.Runner.Worker
 
             Trace.Info("Initializing Job context");
             var jobContext = new JobContext();
-            ExpressionValues.TryGetValue("job", out var jobDictionary);
-            if (jobDictionary != null)
+            if (Global.Variables.GetBoolean(Constants.Runner.Features.AddCheckRunIdToJobContext) ?? false)
             {
-                foreach (var pair in jobDictionary.AssertDictionary("job"))
+                ExpressionValues.TryGetValue("job", out var jobDictionary);
+                if (jobDictionary != null)
                 {
-                    jobContext[pair.Key] = pair.Value;
+                    foreach (var pair in jobDictionary.AssertDictionary("job"))
+                    {
+                        jobContext[pair.Key] = pair.Value;
+                    }
                 }
             }
             ExpressionValues["job"] = jobContext;
@@ -966,9 +969,6 @@ namespace GitHub.Runner.Worker
             // Verbosity (from GitHub.Step_Debug).
             Global.WriteDebug = Global.Variables.Step_Debug ?? false;
 
-            // Debugger enabled flag (from acquire response).
-            Global.Debugger = new Dap.DebuggerConfig(message.EnableDebugger, message.DebuggerTunnel);
-
             // Hook up JobServerQueueThrottling event, we will log warning on server tarpit.
             _jobServerQueue.JobServerQueueThrottling += JobServerQueueThrottling_EventReceived;
         }

src/Runner.Worker/GlobalContext.cs

@@ -4,7 +4,6 @@ using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker.Container;
-using GitHub.Runner.Worker.Dap;
 using Newtonsoft.Json.Linq;
 using Sdk.RSWebApi.Contracts;
 
@@ -28,7 +27,6 @@ namespace GitHub.Runner.Worker
         public StepsContext StepsContext { get; set; }
         public Variables Variables { get; set; }
         public bool WriteDebug { get; set; }
-        public DebuggerConfig Debugger { get; set; }
         public string InfrastructureFailureCategory { get; set; }
         public JObject ContainerHookState { get; set; }
         public bool HasTemplateEvaluatorMismatch { get; set; }

src/Runner.Worker/InternalsVisibleTo.cs

@@ -1,4 +1,3 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Test")]
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

src/Runner.Worker/JobContext.cs

@@ -82,69 +82,5 @@ namespace GitHub.Runner.Worker
                 }
             }
         }
-
-        public string WorkflowRef
-        {
-            get
-            {
-                if (this.TryGetValue("workflow_ref", out var value) && value is StringContextData str)
-                {
-                    return str.Value;
-                }
-                return null;
-            }
-            set
-            {
-                this["workflow_ref"] = value != null ? new StringContextData(value) : null;
-            }
-        }
-
-        public string WorkflowSha
-        {
-            get
-            {
-                if (this.TryGetValue("workflow_sha", out var value) && value is StringContextData str)
-                {
-                    return str.Value;
-                }
-                return null;
-            }
-            set
-            {
-                this["workflow_sha"] = value != null ? new StringContextData(value) : null;
-            }
-        }
-
-        public string WorkflowRepository
-        {
-            get
-            {
-                if (this.TryGetValue("workflow_repository", out var value) && value is StringContextData str)
-                {
-                    return str.Value;
-                }
-                return null;
-            }
-            set
-            {
-                this["workflow_repository"] = value != null ? new StringContextData(value) : null;
-            }
-        }
-
-        public string WorkflowFilePath
-        {
-            get
-            {
-                if (this.TryGetValue("workflow_file_path", out var value) && value is StringContextData str)
-                {
-                    return str.Value;
-                }
-                return null;
-            }
-            set
-            {
-                this["workflow_file_path"] = value != null ? new StringContextData(value) : null;
-            }
-        }
     }
 }

src/Runner.Worker/JobRunner.cs

@@ -13,7 +13,6 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
-using GitHub.Runner.Worker.Dap;
 using GitHub.Services.Common;
 using GitHub.Services.WebApi;
 using Sdk.RSWebApi.Contracts;
@@ -29,7 +28,6 @@ namespace GitHub.Runner.Worker
 
     public sealed class JobRunner : RunnerService, IJobRunner
     {
-        private const string DebuggerConnectionTelemetryPrefix = "DebuggerConnectionResult";
         private IJobServerQueue _jobServerQueue;
         private RunnerSettings _runnerSettings;
         private ITempDirectoryManager _tempDirectoryManager;
@@ -114,7 +112,6 @@ namespace GitHub.Runner.Worker
 
             IExecutionContext jobContext = null;
             CancellationTokenRegistration? runnerShutdownRegistration = null;
-            IDapDebugger dapDebugger = null;
             try
             {
                 // Create the job execution context.
@@ -181,26 +178,6 @@ namespace GitHub.Runner.Worker
                 _tempDirectoryManager = HostContext.GetService<ITempDirectoryManager>();
                 _tempDirectoryManager.InitializeTempDirectory(jobContext);
 
-                // Setup the debugger
-                if (jobContext.Global.Debugger?.Enabled == true)
-                {
-                    Trace.Info("Debugger enabled for this job run");
-
-                    try
-                    {
-                        dapDebugger = HostContext.GetService<IDapDebugger>();
-                        await dapDebugger.StartAsync(jobContext);
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Error($"Failed to start DAP debugger: {ex.Message}");
-                        AddDebuggerConnectionTelemetry(jobContext, $"Failed: {ex.Message}");
-                        jobContext.Error("Failed to start debugger.");
-                        return await CompleteJobAsync(server, jobContext, message, TaskResult.Failed);
-                    }
-                }
-
-
                 // Get the job extension.
                 Trace.Info("Getting job extension.");
                 IJobExtension jobExtension = HostContext.CreateService<IJobExtension>();
@@ -242,33 +219,6 @@ namespace GitHub.Runner.Worker
                     await Task.WhenAny(_jobServerQueue.JobRecordUpdated.Task, Task.Delay(1000));
                 }
 
-                // Wait for DAP debugger client connection and handshake after "Set up job"
-                // so the job page shows the setup step before we block on the debugger
-                if (dapDebugger != null)
-                {
-                    try
-                    {
-                        await dapDebugger.WaitUntilReadyAsync();
-                        AddDebuggerConnectionTelemetry(jobContext, "Connected");
-                    }
-                    catch (OperationCanceledException) when (jobRequestCancellationToken.IsCancellationRequested)
-                    {
-                        Trace.Info("Job was cancelled before debugger client connected.");
-                        AddDebuggerConnectionTelemetry(jobContext, "Canceled");
-                        jobContext.Error("Job was cancelled before debugger client connected.");
-                        return await CompleteJobAsync(server, jobContext, message, TaskResult.Canceled);
-                    }
-                    catch (Exception ex)
-                    {
-                        Trace.Error($"DAP debugger failed to become ready: {ex.Message}");
-                        AddDebuggerConnectionTelemetry(jobContext, $"Failed: {ex.Message}");
-
-                        // If debugging was requested but the debugger is not available, fail the job
-                        jobContext.Error("The debugger failed to start or no debugger client connected in time.");
-                        return await CompleteJobAsync(server, jobContext, message, TaskResult.Failed);
-                    }
-                }
-
                 // Run all job steps
                 Trace.Info("Run all job steps.");
                 var stepsRunner = HostContext.GetService<IStepsRunner>();
@@ -309,11 +259,6 @@ namespace GitHub.Runner.Worker
                     runnerShutdownRegistration = null;
                 }
 
-                if (dapDebugger != null)
-                {
-                    await dapDebugger.OnJobCompletedAsync();
-                }
-
                 await ShutdownQueue(throwOnFailure: false);
             }
         }
@@ -495,15 +440,6 @@ namespace GitHub.Runner.Worker
             throw new AggregateException(exceptions);
         }
 
-        private static void AddDebuggerConnectionTelemetry(IExecutionContext jobContext, string result)
-        {
-            jobContext.Global.JobTelemetry.Add(new JobTelemetry
-            {
-                Type = JobTelemetryType.General,
-                Message = $"{DebuggerConnectionTelemetryPrefix}: {result}"
-            });
-        }
-
         private void MaskTelemetrySecrets(List<JobTelemetry> jobTelemetry)
         {
             foreach (var telemetryItem in jobTelemetry)

src/Runner.Worker/Runner.Worker.csproj

@@ -19,11 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.3" />
-    <PackageReference Include="System.ServiceProcess.ServiceController" Version="10.0.3" />
-    <PackageReference Include="System.Threading.Channels" Version="10.0.3" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
+    <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.1" />
+    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
     <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
-    <PackageReference Include="Microsoft.DevTunnels.Connections" Version="1.3.16" />
   </ItemGroup>
 
   <ItemGroup>

src/Runner.Worker/StepsRunner.cs

@@ -10,7 +10,6 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
-using GitHub.Runner.Worker.Dap;
 using GitHub.Runner.Worker.Expressions;
 
 namespace GitHub.Runner.Worker
@@ -51,7 +50,6 @@ namespace GitHub.Runner.Worker
             jobContext.JobContext.Status = (jobContext.Result ?? TaskResult.Succeeded).ToActionResult();
             var scopeInputs = new Dictionary<string, PipelineContextData>(StringComparer.OrdinalIgnoreCase);
             bool checkPostJobActions = false;
-            var dapDebugger = HostContext.GetService<IDapDebugger>();
             while (jobContext.JobSteps.Count > 0 || !checkPostJobActions)
             {
                 if (jobContext.JobSteps.Count == 0 && !checkPostJobActions)
@@ -228,14 +226,9 @@ namespace GitHub.Runner.Worker
                         }
                         else
                         {
-                            // Pause for DAP debugger before step execution
-                            await dapDebugger?.OnStepStartingAsync(step);
-
                             // Run the step
                             await RunStepAsync(step, jobContext.CancellationToken);
                             CompleteStep(step);
-
-                            dapDebugger?.OnStepCompleted(step);
                         }
                     }
                     finally
@@ -262,7 +255,6 @@ namespace GitHub.Runner.Worker
 
                 Trace.Info($"Current state: job state = '{jobContext.Result}'");
             }
-
         }
 
         private async Task RunStepAsync(IStep step, CancellationToken jobCancellationToken)

src/Sdk/DTPipelines/Pipelines/AgentJobRequestMessage.cs

@@ -253,20 +253,6 @@ namespace GitHub.DistributedTask.Pipelines
             set;
         }
 
-        [DataMember(EmitDefaultValue = false)]
-        public bool EnableDebugger
-        {
-            get;
-            set;
-        }
-
-        [DataMember(EmitDefaultValue = false)]
-        public DebuggerTunnelInfo DebuggerTunnel
-        {
-            get;
-            set;
-        }
-
         /// <summary>
         /// Gets the collection of variables associated with the current context.
         /// </summary>

src/Sdk/DTPipelines/Pipelines/DebuggerTunnelInfo.cs

@@ -1,24 +0,0 @@
-using System.Runtime.Serialization;
-
-namespace GitHub.DistributedTask.Pipelines
-{
-    /// <summary>
-    /// Dev Tunnel information the runner needs to host the debugger tunnel.
-    /// Matches the run-service <c>DebuggerTunnel</c> contract.
-    /// </summary>
-    [DataContract]
-    public sealed class DebuggerTunnelInfo
-    {
-        [DataMember(EmitDefaultValue = false)]
-        public string TunnelId { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public string ClusterId { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public string HostToken { get; set; }
-
-        [DataMember(EmitDefaultValue = false)]
-        public ushort Port { get; set; }
-    }
-}

src/Sdk/Sdk.csproj

@@ -23,14 +23,14 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
         <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
-        <PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.3" />
-        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.3" />
+        <PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.2" />
+        <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
         <PackageReference Include="Minimatch" Version="2.0.0" />
         <PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
         <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
         <PackageReference Include="System.Private.Uri" Version="4.3.2" />
-        <PackageReference Include="System.Formats.Asn1" Version="10.0.3" />
+        <PackageReference Include="System.Formats.Asn1" Version="10.0.2" />
     </ItemGroup>
 
     <ItemGroup>

src/Sdk/WorkflowParser/Conversion/PermissionsHelper.cs

@@ -32,7 +32,7 @@ namespace GitHub.Actions.WorkflowParser.Conversion
                 return;
             }
 
-            var effectiveMax = explicitMax ?? CreatePermissionsFromPolicy(context, permissionsPolicy, includeIdToken: isTrusted, includeModels: context.GetFeatures().AllowModelsPermission, includeWorkflows: context.GetFeatures().AllowWorkflowsPermission);
+            var effectiveMax = explicitMax ?? CreatePermissionsFromPolicy(context, permissionsPolicy, includeIdToken: isTrusted, includeModels: context.GetFeatures().AllowModelsPermission);
             
             if (requested.ViolatesMaxPermissions(effectiveMax, out var permissionLevelViolations))
             {
@@ -59,8 +59,7 @@ namespace GitHub.Actions.WorkflowParser.Conversion
             TemplateContext context,
             string permissionsPolicy,
             bool includeIdToken,
-            bool includeModels,
-            bool includeWorkflows)
+            bool includeModels)
         {
             switch (permissionsPolicy)
             {
@@ -71,7 +70,7 @@ namespace GitHub.Actions.WorkflowParser.Conversion
                         Packages = PermissionLevel.Read,
                     };
                 case WorkflowConstants.PermissionsPolicy.Write:
-                    return new Permissions(PermissionLevel.Write, includeIdToken: includeIdToken, includeAttestations: true, includeModels: includeModels, includeWorkflows: includeWorkflows);
+                    return new Permissions(PermissionLevel.Write, includeIdToken: includeIdToken, includeAttestations: true, includeModels: includeModels);
                 default:
                     throw new ArgumentException($"Unexpected permission policy: '{permissionsPolicy}'");
             }

src/Sdk/WorkflowParser/Conversion/WorkflowTemplateConverter.cs

@@ -1877,7 +1877,7 @@ namespace GitHub.Actions.WorkflowParser.Conversion
                         permissionsStr.AssertUnexpectedValue(permissionsStr.Value);
                         break;
                 }
-                return new Permissions(permissionLevel, includeIdToken: true, includeAttestations: true, includeModels: context.GetFeatures().AllowModelsPermission, includeWorkflows: context.GetFeatures().AllowWorkflowsPermission);
+                return new Permissions(permissionLevel, includeIdToken: true, includeAttestations: true, includeModels: context.GetFeatures().AllowModelsPermission);
             }
 
             var mapping = token.AssertMapping("permissions");
@@ -1957,24 +1957,6 @@ namespace GitHub.Actions.WorkflowParser.Conversion
                             context.Error(key, $"The permission 'models' is not allowed");
                         }
                         break;
-                    case "workflows":
-                        if (context.GetFeatures().AllowWorkflowsPermission)
-                        {
-                            // Workflows only supports write; downgrade read to none
-                            if (permissionLevel == PermissionLevel.Read)
-                            {
-                                permissions.Workflows = PermissionLevel.NoAccess;
-                            }
-                            else
-                            {
-                                permissions.Workflows = permissionLevel;
-                            }
-                        }
-                        else
-                        {
-                            context.Error(key, $"The permission 'workflows' is not allowed");
-                        }
-                        break;
                     default:
                         break;
                 }

src/Sdk/WorkflowParser/Permissions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 using GitHub.Actions.WorkflowParser.Conversion;
@@ -17,7 +17,7 @@ namespace GitHub.Actions.WorkflowParser
         public Permissions(Permissions copy)
         {
             Actions = copy.Actions;
-            ArtifactMetadata = copy.ArtifactMetadata;
+			ArtifactMetadata = copy.ArtifactMetadata;
             Attestations = copy.Attestations;
             Checks = copy.Checks;
             Contents = copy.Contents;
@@ -32,18 +32,16 @@ namespace GitHub.Actions.WorkflowParser
             SecurityEvents = copy.SecurityEvents;
             IdToken = copy.IdToken;
             Models = copy.Models;
-            Workflows = copy.Workflows;
         }
 
         public Permissions(
             PermissionLevel permissionLevel,
             bool includeIdToken,
             bool includeAttestations,
-            bool includeModels,
-            bool includeWorkflows = false)
+            bool includeModels)
         {
             Actions = permissionLevel;
-            ArtifactMetadata = permissionLevel;
+			ArtifactMetadata = permissionLevel;
             Attestations = includeAttestations ? permissionLevel : PermissionLevel.NoAccess;
             Checks = permissionLevel;
             Contents = permissionLevel;
@@ -58,12 +56,8 @@ namespace GitHub.Actions.WorkflowParser
             SecurityEvents = permissionLevel;
             IdToken = includeIdToken ? permissionLevel : PermissionLevel.NoAccess;
             // Models must not have higher permissions than Read
-            Models = includeModels
-                ? (permissionLevel == PermissionLevel.Write ? PermissionLevel.Read : permissionLevel)
-                : PermissionLevel.NoAccess;
-            // Workflows is write-only, so only grant it when permissionLevel is Write
-            Workflows = includeWorkflows && permissionLevel == PermissionLevel.Write
-                ? PermissionLevel.Write
+            Models = includeModels 
+                ? (permissionLevel == PermissionLevel.Write ? PermissionLevel.Read : permissionLevel) 
                 : PermissionLevel.NoAccess;
         }
 
@@ -87,7 +81,6 @@ namespace GitHub.Actions.WorkflowParser
                 new KeyValuePair<string, (PermissionLevel, PermissionLevel)>("security-events", (left.SecurityEvents, right.SecurityEvents)),
                 new KeyValuePair<string, (PermissionLevel, PermissionLevel)>("id-token", (left.IdToken, right.IdToken)),
                 new KeyValuePair<string, (PermissionLevel, PermissionLevel)>("models", (left.Models, right.Models)),
-                new KeyValuePair<string, (PermissionLevel, PermissionLevel)>("workflows", (left.Workflows, right.Workflows)),
             };
         }
 
@@ -203,13 +196,6 @@ namespace GitHub.Actions.WorkflowParser
             set;
         }
 
-        [DataMember(Name = "workflows", EmitDefaultValue = false)]
-        public PermissionLevel Workflows
-        {
-            get;
-            set;
-        }
-
         public Permissions Clone()
         {
             return new Permissions(this);

src/Sdk/WorkflowParser/WorkflowFeatures.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -41,13 +41,6 @@ namespace GitHub.Actions.WorkflowParser
         [DataMember(EmitDefaultValue = false)]
         public bool AllowModelsPermission { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether users may use the "workflows" permission.
-        /// Used during parsing only.
-        /// </summary>
-        [DataMember(EmitDefaultValue = false)]
-        public bool AllowWorkflowsPermission { get; set; }
-
         /// <summary>
         /// Gets or sets a value indicating whether the expression function fromJson performs strict JSON parsing.
         /// Used during evaluation only.
@@ -74,7 +67,6 @@ namespace GitHub.Actions.WorkflowParser
                 Snapshot = false,           // Default to false since this feature is still in an experimental phase
                 StrictJsonParsing = false,  // Default to false since this is temporary for telemetry purposes only
                 AllowModelsPermission = false, // Default to false since we want this to be disabled for all non-production environments
-                AllowWorkflowsPermission = false, // Default to false; gated by feature flag for controlled rollout
                 AllowServiceContainerCommand = false, // Default to false since this feature is gated by actions_service_container_command
             };
         }

src/Test/L0/Sdk/RSWebApi/AgentJobRequestMessageL0.cs

@@ -1,126 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using Xunit;
-using GitHub.DistributedTask.Pipelines;
-
-namespace GitHub.Actions.RunService.WebApi.Tests;
-
-public sealed class AgentJobRequestMessageL0
-{
-    [Fact]
-    [Trait("Level", "L0")]
-    [Trait("Category", "Common")]
-    public void VerifyEnableDebuggerDeserialization_WithTrue()
-    {
-        // Arrange
-        var serializer = new DataContractJsonSerializer(typeof(AgentJobRequestMessage));
-        string jsonWithEnabledDebugger = DoubleQuotify("{'EnableDebugger': true}");
-        
-        // Act
-        using var stream = new MemoryStream();
-        stream.Write(Encoding.UTF8.GetBytes(jsonWithEnabledDebugger));
-        stream.Position = 0;
-        var recoveredMessage = serializer.ReadObject(stream) as AgentJobRequestMessage;
-        
-        // Assert
-        Assert.NotNull(recoveredMessage);
-        Assert.True(recoveredMessage.EnableDebugger, "EnableDebugger should be true when JSON contains 'EnableDebugger': true");
-    }
-
-    [Fact]
-    [Trait("Level", "L0")]
-    [Trait("Category", "Common")]
-    public void VerifyEnableDebuggerDeserialization_DefaultToFalse()
-    {
-        // Arrange
-        var serializer = new DataContractJsonSerializer(typeof(AgentJobRequestMessage));
-        string jsonWithoutDebugger = DoubleQuotify("{'messageType': 'PipelineAgentJobRequest'}");
-        
-        // Act
-        using var stream = new MemoryStream();
-        stream.Write(Encoding.UTF8.GetBytes(jsonWithoutDebugger));
-        stream.Position = 0;
-        var recoveredMessage = serializer.ReadObject(stream) as AgentJobRequestMessage;
-        
-        // Assert
-        Assert.NotNull(recoveredMessage);
-        Assert.False(recoveredMessage.EnableDebugger, "EnableDebugger should default to false when JSON field is absent");
-    }
-
-    [Fact]
-    [Trait("Level", "L0")]
-    [Trait("Category", "Common")]
-    public void VerifyEnableDebuggerDeserialization_WithFalse()
-    {
-        // Arrange
-        var serializer = new DataContractJsonSerializer(typeof(AgentJobRequestMessage));
-        string jsonWithDisabledDebugger = DoubleQuotify("{'EnableDebugger': false}");
-        
-        // Act
-        using var stream = new MemoryStream();
-        stream.Write(Encoding.UTF8.GetBytes(jsonWithDisabledDebugger));
-        stream.Position = 0;
-        var recoveredMessage = serializer.ReadObject(stream) as AgentJobRequestMessage;
-        
-        // Assert
-        Assert.NotNull(recoveredMessage);
-        Assert.False(recoveredMessage.EnableDebugger, "EnableDebugger should be false when JSON contains 'EnableDebugger': false");
-    }
-
-    [Fact]
-    [Trait("Level", "L0")]
-    [Trait("Category", "Common")]
-    public void VerifyDebuggerTunnelDeserialization_WithTunnel()
-    {
-        // Arrange
-        var serializer = new DataContractJsonSerializer(typeof(AgentJobRequestMessage), new DataContractJsonSerializerSettings
-        {
-            KnownTypes = new[] { typeof(DebuggerTunnelInfo) }
-        });
-        string json = DoubleQuotify(
-            "{'EnableDebugger': true, 'DebuggerTunnel': {'TunnelId': 'tun-123', 'ClusterId': 'use2', 'HostToken': 'tok-abc', 'Port': 4711}}");
-
-        // Act
-        using var stream = new MemoryStream();
-        stream.Write(Encoding.UTF8.GetBytes(json));
-        stream.Position = 0;
-        var recoveredMessage = serializer.ReadObject(stream) as AgentJobRequestMessage;
-
-        // Assert
-        Assert.NotNull(recoveredMessage);
-        Assert.True(recoveredMessage.EnableDebugger);
-        Assert.NotNull(recoveredMessage.DebuggerTunnel);
-        Assert.Equal("tun-123", recoveredMessage.DebuggerTunnel.TunnelId);
-        Assert.Equal("use2", recoveredMessage.DebuggerTunnel.ClusterId);
-        Assert.Equal("tok-abc", recoveredMessage.DebuggerTunnel.HostToken);
-        Assert.Equal(4711, recoveredMessage.DebuggerTunnel.Port);
-    }
-
-    [Fact]
-    [Trait("Level", "L0")]
-    [Trait("Category", "Common")]
-    public void VerifyDebuggerTunnelDeserialization_WithoutTunnel()
-    {
-        // Arrange
-        var serializer = new DataContractJsonSerializer(typeof(AgentJobRequestMessage));
-        string json = DoubleQuotify("{'EnableDebugger': true}");
-
-        // Act
-        using var stream = new MemoryStream();
-        stream.Write(Encoding.UTF8.GetBytes(json));
-        stream.Position = 0;
-        var recoveredMessage = serializer.ReadObject(stream) as AgentJobRequestMessage;
-
-        // Assert
-        Assert.NotNull(recoveredMessage);
-        Assert.True(recoveredMessage.EnableDebugger);
-        Assert.Null(recoveredMessage.DebuggerTunnel);
-    }
-
-    private static string DoubleQuotify(string text)
-    {
-        return text.Replace('\'', '"');
-    }
-}

src/Test/L0/ServiceInterfacesL0.cs

@@ -2,7 +2,6 @@
 using GitHub.Runner.Listener.Check;
 using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Dap;
 using GitHub.Runner.Worker.Container.ContainerHooks;
 using GitHub.Runner.Worker.Handlers;
 using System;

src/Test/L0/Worker/ActionManagerL0.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.IO;
 using System.IO.Compression;
 using System.Net;
@@ -1255,659 +1254,6 @@ runs:
         }
 #endif
 
-        // =================================================================
-        // Tests for batched action resolution optimization
-        // =================================================================
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_BatchesResolutionAcrossCompositeActions()
-        {
-            // Verifies that when multiple composite actions at the same depth
-            // reference sub-actions, those sub-actions are resolved in a single
-            // batched API call rather than one call per composite.
-            //
-            // Action tree:
-            //   CompositePrestep (composite) → [Node action, CompositePrestep2 (composite)]
-            //   CompositePrestep2 (composite) → [Node action, Docker action]
-            //
-            // Without batching: 3 API calls (depth 0, depth 1 for CompositePrestep, depth 2 for CompositePrestep2)
-            // With batching: still 3 calls at most, but the key is that depth-1
-            //   sub-actions from all composites at depth 0 are batched into 1 call.
-            //   And the same action appearing at multiple depths triggers only 1 resolve.
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-
-                var resolveCallCount = 0;
-                var resolvedActions = new List<ActionReferenceList>();
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        resolveCallCount++;
-                        resolvedActions.Add(actions);
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "CompositePrestep",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                var result = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                // The composite tree is:
-                //   depth 0: CompositePrestep
-                //   depth 1: Node@RepositoryActionWithWrapperActionfile_Node + CompositePrestep2
-                //   depth 2: Node@RepositoryActionWithWrapperActionfile_Node + Docker@RepositoryActionWithWrapperActionfile_Docker
-                //
-                // With batching:
-                //   Call 1 (depth 0, resolve): CompositePrestep
-                //   Call 2 (depth 0→1, pre-resolve): Node + CompositePrestep2 in one batch
-                //   Call 3 (depth 1→2, pre-resolve): Docker only (Node already cached from call 2)
-                Assert.Equal(3, resolveCallCount);
-
-                // Call 1: depth 0 resolve — just the top-level composite
-                var call1Keys = resolvedActions[0].Actions.Select(a => $"{a.NameWithOwner}@{a.Ref}").OrderBy(k => k).ToList();
-                Assert.Equal(new[] { "TingluoHuang/runner_L0@CompositePrestep" }, call1Keys);
-
-                // Call 2: depth 0→1 pre-resolve — batch both children of CompositePrestep
-                var call2Keys = resolvedActions[1].Actions.Select(a => $"{a.NameWithOwner}@{a.Ref}").OrderBy(k => k).ToList();
-                Assert.Equal(new[] { "TingluoHuang/runner_L0@CompositePrestep2", "TingluoHuang/runner_L0@RepositoryActionWithWrapperActionfile_Node" }, call2Keys);
-
-                // Call 3: depth 1→2 pre-resolve — only Docker (Node was cached in call 2)
-                var call3Keys = resolvedActions[2].Actions.Select(a => $"{a.NameWithOwner}@{a.Ref}").OrderBy(k => k).ToList();
-                Assert.Equal(new[] { "TingluoHuang/runner_L0@RepositoryActionWithWrapperActionfile_Docker" }, call3Keys);
-
-                // Verify all actions were downloaded
-                Assert.True(File.Exists(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "CompositePrestep.completed")));
-                Assert.True(File.Exists(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Node.completed")));
-                Assert.True(File.Exists(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "CompositePrestep2.completed")));
-                Assert.True(File.Exists(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Docker.completed")));
-
-                // Verify pre-step tracking still works correctly
-                Assert.Equal(1, result.PreStepTracker.Count);
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_DeduplicatesResolutionAcrossDepthLevels()
-        {
-            // Verifies that an action appearing at multiple depths in the
-            // composite tree is only resolved once (not re-resolved at each level).
-            //
-            // CompositePrestep uses Node action at depth 1.
-            // CompositePrestep2 (also at depth 1) uses the SAME Node action at depth 2.
-            // The Node action should only be resolved once total.
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-
-                var allResolvedKeys = new List<string>();
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            allResolvedKeys.Add(key);
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "CompositePrestep",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                // TingluoHuang/runner_L0@RepositoryActionWithWrapperActionfile_Node appears
-                // at both depth 1 (sub-step of CompositePrestep) and depth 2 (sub-step of
-                // CompositePrestep2). With deduplication it should only be resolved once.
-                var nodeActionKey = "TingluoHuang/runner_L0@RepositoryActionWithWrapperActionfile_Node";
-                var nodeResolveCount = allResolvedKeys.FindAll(k => k == nodeActionKey).Count;
-                Assert.Equal(1, nodeResolveCount);
-
-                // Verify the total number of unique actions resolved matches the tree
-                var uniqueKeys = new HashSet<string>(allResolvedKeys);
-                // Expected unique actions: CompositePrestep, Node, CompositePrestep2, Docker = 4
-                Assert.Equal(4, uniqueKeys.Count);
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_MultipleTopLevelActions_BatchesResolution()
-        {
-            // Verifies that multiple independent actions at depth 0 are
-            // resolved in a single API call.
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-                // Node action has pre+post, needs IActionRunner instances
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-
-                var resolveCallCount = 0;
-                var firstCallActionCount = 0;
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        resolveCallCount++;
-                        if (resolveCallCount == 1)
-                        {
-                            firstCallActionCount = actions.Actions.Count;
-                        }
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action1",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithWrapperActionfile_Node",
-                            RepositoryType = "GitHub"
-                        }
-                    },
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action2",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithWrapperActionfile_Docker",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                // Both actions are at depth 0 — should be resolved in a single batch call
-                Assert.Equal(1, resolveCallCount);
-                Assert.Equal(2, firstCallActionCount);
-
-                // Verify both were downloaded
-                Assert.True(File.Exists(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Node.completed")));
-                Assert.True(File.Exists(Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Docker.completed")));
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-
-#if OS_LINUX
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_NestedCompositeContainers_BatchedResolution()
-        {
-            // Verifies batching with nested composite actions that reference
-            // container actions (Linux-only since containers require Linux).
-            //
-            // CompositeContainerNested (composite):
-            //   → repositoryactionwithdockerfile (Dockerfile)
-            //   → CompositeContainerNested2 (composite):
-            //       → repositoryactionwithdockerfile (Dockerfile, same as above)
-            //       → notpullorbuildimagesmultipletimes1 (Dockerfile)
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-
-                var resolveCallCount = 0;
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        resolveCallCount++;
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "CompositeContainerNested",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                var result = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                // Tree has 3 depth levels with 5 unique actions.
-                // With batching, should need at most 3 resolve calls (one per depth level).
-                Assert.True(resolveCallCount <= 3, $"Expected at most 3 resolve calls but got {resolveCallCount}");
-
-                // repositoryactionwithdockerfile appears at both depth 1 and depth 2.
-                // Container setup should still work correctly — 2 unique Docker images.
-                Assert.Equal(2, result.ContainerSetupSteps.Count);
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-#endif
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_ParallelDownloads_MultipleUniqueActions()
-        {
-            // Verifies that multiple unique top-level actions are downloaded via
-            // DownloadActionsInParallelAsync (the parallel code path), and that
-            // all actions are correctly resolved and downloaded.
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-                // Node action has pre step, and CompositePrestep recurses into
-                // sub-actions that also need IActionRunner instances
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-
-                var resolveCallCount = 0;
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        Interlocked.Increment(ref resolveCallCount);
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action1",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithWrapperActionfile_Node",
-                            RepositoryType = "GitHub"
-                        }
-                    },
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action2",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithWrapperActionfile_Docker",
-                            RepositoryType = "GitHub"
-                        }
-                    },
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action3",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "CompositePrestep",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                // 3 unique actions at depth 0 → triggers DownloadActionsInParallelAsync
-                // (parallel path used when uniqueDownloads.Count > 1)
-                var nodeCompleted = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Node.completed");
-                var dockerCompleted = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Docker.completed");
-                var compositeCompleted = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang/runner_L0", "CompositePrestep.completed");
-
-                Assert.True(File.Exists(nodeCompleted), $"Expected watermark at {nodeCompleted}");
-                Assert.True(File.Exists(dockerCompleted), $"Expected watermark at {dockerCompleted}");
-                Assert.True(File.Exists(compositeCompleted), $"Expected watermark at {compositeCompleted}");
-
-                // All depth-0 actions resolved in a single batch call.
-                // Composite sub-actions may add 1-2 more calls.
-                Assert.True(resolveCallCount >= 1, "Expected at least 1 resolve call");
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadsNextLevelActionsBeforeRecursing()
-        {
-            // Verifies that depth-1 actions are downloaded before the depth-2
-            // pre-resolve fires. We detect this by snapshotting watermark state
-            // inside the 3rd ResolveActionDownloadInfoAsync callback (which is
-            // the depth-2 pre-resolve). If pre-download works, depth-1 watermarks
-            // already exist at that point.
-            //
-            // Action tree:
-            //   CompositePrestep (composite) → [Node, CompositePrestep2 (composite)]
-            //   CompositePrestep2 (composite) → [Node, Docker]
-            //
-            // Without pre-download: downloads happen during recursion (serial per depth)
-            // With pre-download: depth 1 actions (Node + CompositePrestep2) are
-            //   downloaded in parallel before recursing, so recursion is a no-op
-            //   for downloads.
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-
-                // Track watermark state at the time of each resolve call.
-                // If pre-download works, when the 3rd resolve fires (depth 2
-                // pre-resolve for Docker), the depth-1 actions (Node +
-                // CompositePrestep2) should already have watermarks on disk.
-                var resolveCallCount = 0;
-                var watermarksAtResolve3 = new Dictionary<string, bool>();
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        resolveCallCount++;
-                        if (resolveCallCount == 3)
-                        {
-                            // At the time of the 3rd resolve, check if depth-1 actions
-                            // are already downloaded (pre-download should have done this)
-                            var actionsDir2 = _hc.GetDirectory(WellKnownDirectory.Actions);
-                            watermarksAtResolve3["Node"] = File.Exists(Path.Combine(actionsDir2, "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Node.completed"));
-                            watermarksAtResolve3["CompositePrestep2"] = File.Exists(Path.Combine(actionsDir2, "TingluoHuang/runner_L0", "CompositePrestep2.completed"));
-                        }
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actionId = Guid.NewGuid();
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action",
-                        Id = actionId,
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "CompositePrestep",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                var result = await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert
-                // All actions should be downloaded (watermarks exist)
-                var actionsDir = _hc.GetDirectory(WellKnownDirectory.Actions);
-                Assert.True(File.Exists(Path.Combine(actionsDir, "TingluoHuang/runner_L0", "CompositePrestep.completed")));
-                Assert.True(File.Exists(Path.Combine(actionsDir, "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Node.completed")));
-                Assert.True(File.Exists(Path.Combine(actionsDir, "TingluoHuang/runner_L0", "CompositePrestep2.completed")));
-                Assert.True(File.Exists(Path.Combine(actionsDir, "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Docker.completed")));
-
-                // 3 resolve calls total
-                Assert.Equal(3, resolveCallCount);
-
-                // The key assertion: at the time of the 3rd resolve call
-                // (pre-resolve for depth 2), the depth-1 actions should
-                // ALREADY be downloaded thanks to pre-download.
-                // Without pre-download, these watermarks wouldn't exist yet
-                // because depth-1 downloads would only happen during recursion.
-                Assert.True(watermarksAtResolve3["Node"],
-                    "Node action should be pre-downloaded before depth 2 pre-resolve");
-                Assert.True(watermarksAtResolve3["CompositePrestep2"],
-                    "CompositePrestep2 should be pre-downloaded before depth 2 pre-resolve");
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async void PrepareActions_ParallelDownloadsAtSameDepth()
-        {
-            // Verifies that multiple unique actions at the same depth are
-            // downloaded concurrently (Task.WhenAll) rather than sequentially.
-            // We detect this by checking that all watermarks exist after a
-            // single PrepareActionsAsync call with multiple top-level actions.
-            Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", "true");
-            try
-            {
-                //Arrange
-                Setup();
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-                _hc.EnqueueInstance<IActionRunner>(new Mock<IActionRunner>().Object);
-
-                _jobServer.Setup(x => x.ResolveActionDownloadInfoAsync(It.IsAny<Guid>(), It.IsAny<string>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<ActionReferenceList>(), It.IsAny<CancellationToken>()))
-                    .Returns((Guid scopeIdentifier, string hubName, Guid planId, Guid jobId, ActionReferenceList actions, CancellationToken cancellationToken) =>
-                    {
-                        var result = new ActionDownloadInfoCollection { Actions = new Dictionary<string, ActionDownloadInfo>() };
-                        foreach (var action in actions.Actions)
-                        {
-                            var key = $"{action.NameWithOwner}@{action.Ref}";
-                            result.Actions[key] = new ActionDownloadInfo
-                            {
-                                NameWithOwner = action.NameWithOwner,
-                                Ref = action.Ref,
-                                ResolvedNameWithOwner = action.NameWithOwner,
-                                ResolvedSha = $"{action.Ref}-sha",
-                                TarballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/tarball/{action.Ref}",
-                                ZipballUrl = $"https://api.github.com/repos/{action.NameWithOwner}/zipball/{action.Ref}",
-                            };
-                        }
-                        return Task.FromResult(result);
-                    });
-
-                var actions = new List<Pipelines.ActionStep>
-                {
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action1",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithWrapperActionfile_Node",
-                            RepositoryType = "GitHub"
-                        }
-                    },
-                    new Pipelines.ActionStep()
-                    {
-                        Name = "action2",
-                        Id = Guid.NewGuid(),
-                        Reference = new Pipelines.RepositoryPathReference()
-                        {
-                            Name = "TingluoHuang/runner_L0",
-                            Ref = "RepositoryActionWithWrapperActionfile_Docker",
-                            RepositoryType = "GitHub"
-                        }
-                    }
-                };
-
-                //Act
-                await _actionManager.PrepareActionsAsync(_ec.Object, actions);
-
-                //Assert - both downloaded (parallel path used when > 1 unique download)
-                var actionsDir = _hc.GetDirectory(WellKnownDirectory.Actions);
-                Assert.True(File.Exists(Path.Combine(actionsDir, "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Node.completed")));
-                Assert.True(File.Exists(Path.Combine(actionsDir, "TingluoHuang/runner_L0", "RepositoryActionWithWrapperActionfile_Docker.completed")));
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("ACTIONS_BATCH_ACTION_RESOLUTION", null);
-                Teardown();
-            }
-        }
-
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]

src/Test/L0/Worker/DapDebuggerL0.cs

@@ -1,640 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Moq;
-using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Dap;
-using Newtonsoft.Json;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Worker
-{
-    public sealed class DapDebuggerL0
-    {
-        private const string TimeoutEnvironmentVariable = "ACTIONS_RUNNER_DAP_CONNECTION_TIMEOUT";
-        private const string TunnelConnectTimeoutVariable = "ACTIONS_RUNNER_DAP_TUNNEL_CONNECT_TIMEOUT_SECONDS";
-        private DapDebugger _debugger;
-
-        private TestHostContext CreateTestContext([CallerMemberName] string testName = "")
-        {
-            var hc = new TestHostContext(this, testName);
-            _debugger = new DapDebugger();
-            _debugger.Initialize(hc);
-            _debugger.SkipTunnelRelay = true;
-            return hc;
-        }
-
-        private static async Task WithEnvironmentVariableAsync(string name, string value, Func<Task> action)
-        {
-            var originalValue = Environment.GetEnvironmentVariable(name);
-            Environment.SetEnvironmentVariable(name, value);
-            try
-            {
-                await action();
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable(name, originalValue);
-            }
-        }
-
-        private static void WithEnvironmentVariable(string name, string value, Action action)
-        {
-            var originalValue = Environment.GetEnvironmentVariable(name);
-            Environment.SetEnvironmentVariable(name, value);
-            try
-            {
-                action();
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable(name, originalValue);
-            }
-        }
-
-        private static ushort GetFreePort()
-        {
-            using var listener = new TcpListener(IPAddress.Loopback, 0);
-            listener.Start();
-            return (ushort)((IPEndPoint)listener.LocalEndpoint).Port;
-        }
-
-        private static async Task<TcpClient> ConnectClientAsync(int port)
-        {
-            var client = new TcpClient();
-            await client.ConnectAsync(IPAddress.Loopback, port);
-            return client;
-        }
-
-        private static async Task SendRequestAsync(NetworkStream stream, Request request)
-        {
-            var json = JsonConvert.SerializeObject(request);
-            var body = Encoding.UTF8.GetBytes(json);
-            var header = $"Content-Length: {body.Length}\r\n\r\n";
-            var headerBytes = Encoding.ASCII.GetBytes(header);
-
-            await stream.WriteAsync(headerBytes, 0, headerBytes.Length);
-            await stream.WriteAsync(body, 0, body.Length);
-            await stream.FlushAsync();
-        }
-
-        /// <summary>
-        /// Reads a single DAP-framed message from a stream with a timeout.
-        /// Parses the Content-Length header, reads exactly that many bytes,
-        /// and returns the JSON body. Fails with a clear error on timeout.
-        /// </summary>
-        private static async Task<string> ReadDapMessageAsync(NetworkStream stream, TimeSpan timeout)
-        {
-            using var cts = new CancellationTokenSource(timeout);
-            var token = cts.Token;
-
-            var headerBuilder = new StringBuilder();
-            var buffer = new byte[1];
-            var contentLength = -1;
-
-            while (true)
-            {
-                var readTask = stream.ReadAsync(buffer, 0, 1, token);
-                var bytesRead = await readTask;
-                if (bytesRead == 0)
-                {
-                    throw new EndOfStreamException("Connection closed while reading DAP headers");
-                }
-
-                headerBuilder.Append((char)buffer[0]);
-                var headers = headerBuilder.ToString();
-                if (headers.EndsWith("\r\n\r\n", StringComparison.Ordinal))
-                {
-                    foreach (var line in headers.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries))
-                    {
-                        if (line.StartsWith("Content-Length: ", StringComparison.OrdinalIgnoreCase))
-                        {
-                            contentLength = int.Parse(line.Substring("Content-Length: ".Length).Trim());
-                        }
-                    }
-                    break;
-                }
-            }
-
-            if (contentLength < 0)
-            {
-                throw new InvalidOperationException("No Content-Length header found in DAP message");
-            }
-
-            var body = new byte[contentLength];
-            var totalRead = 0;
-            while (totalRead < contentLength)
-            {
-                var bytesRead = await stream.ReadAsync(body, totalRead, contentLength - totalRead, token);
-                if (bytesRead == 0)
-                {
-                    throw new EndOfStreamException("Connection closed while reading DAP body");
-                }
-                totalRead += bytesRead;
-            }
-
-            return Encoding.UTF8.GetString(body);
-        }
-
-        private static Mock<IExecutionContext> CreateJobContextWithTunnel(CancellationToken cancellationToken, ushort port, string jobName = null)
-        {
-            var tunnel = new GitHub.DistributedTask.Pipelines.DebuggerTunnelInfo
-            {
-                TunnelId = "test-tunnel",
-                ClusterId = "test-cluster",
-                HostToken = "test-token",
-                Port = port
-            };
-            var debuggerConfig = new DebuggerConfig(true, tunnel);
-            var jobContext = new Mock<IExecutionContext>();
-            jobContext.Setup(x => x.CancellationToken).Returns(cancellationToken);
-            jobContext.Setup(x => x.Global).Returns(new GlobalContext { Debugger = debuggerConfig });
-            jobContext
-                .Setup(x => x.GetGitHubContext(It.IsAny<string>()))
-                .Returns((string contextName) => string.Equals(contextName, "job", StringComparison.Ordinal) ? jobName : null);
-            return jobContext;
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void InitializeSucceeds()
-        {
-            using (CreateTestContext())
-            {
-                Assert.NotNull(_debugger);
-                Assert.False(_debugger.IsActive);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StartAsyncFailsWithoutValidTunnelConfig()
-        {
-            using (CreateTestContext())
-            {
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = new Mock<IExecutionContext>();
-                jobContext.Setup(x => x.CancellationToken).Returns(cts.Token);
-                jobContext.Setup(x => x.Global).Returns(new GlobalContext
-                {
-                    Debugger = new DebuggerConfig(true, null)
-                });
-
-                await Assert.ThrowsAsync<ArgumentException>(() => _debugger.StartAsync(jobContext.Object));
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StartAsyncUsesPortFromTunnelConfig()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-                using var client = await ConnectClientAsync(port);
-                Assert.True(client.Connected);
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTimeoutUsesCustomTimeoutFromEnvironment()
-        {
-            using (CreateTestContext())
-            {
-                WithEnvironmentVariable(TimeoutEnvironmentVariable, "30", () =>
-                {
-                    Assert.Equal(30, _debugger.ResolveTimeout());
-                });
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTimeoutIgnoresInvalidTimeoutFromEnvironment()
-        {
-            using (CreateTestContext())
-            {
-                WithEnvironmentVariable(TimeoutEnvironmentVariable, "not-a-number", () =>
-                {
-                    Assert.Equal(15, _debugger.ResolveTimeout());
-                });
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTimeoutIgnoresZeroTimeoutFromEnvironment()
-        {
-            using (CreateTestContext())
-            {
-                WithEnvironmentVariable(TimeoutEnvironmentVariable, "0", () =>
-                {
-                    Assert.Equal(15, _debugger.ResolveTimeout());
-                });
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StartAndStopLifecycle()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-                using var client = await ConnectClientAsync(port);
-                Assert.True(client.Connected);
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StartAndStopMultipleTimesDoesNotThrow()
-        {
-            using (CreateTestContext())
-            {
-                foreach (var port in new[] { GetFreePort(), GetFreePort() })
-                {
-                    using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                    var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                    await _debugger.StartAsync(jobContext.Object);
-                    await _debugger.StopAsync();
-                }
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task WaitUntilReadyCompletesAfterClientConnectionAndConfigurationDone()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-
-                var waitTask = _debugger.WaitUntilReadyAsync();
-                using var client = await ConnectClientAsync(port);
-                await SendRequestAsync(client.GetStream(), new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "configurationDone"
-                });
-
-                await waitTask;
-                Assert.Equal(DapSessionState.Ready, _debugger.State);
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StartStoresJobContextForThreadsRequest()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port, "ci-job");
-                await _debugger.StartAsync(jobContext.Object);
-                using var client = await ConnectClientAsync(port);
-                var stream = client.GetStream();
-                await SendRequestAsync(client.GetStream(), new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "threads"
-                });
-
-                var response = await ReadDapMessageAsync(stream, TimeSpan.FromSeconds(5));
-                Assert.Contains("\"command\":\"threads\"", response);
-                Assert.Contains("\"name\":\"Job: ci-job\"", response);
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task CancellationUnblocksAndOnJobCompletedTerminates()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-
-                var waitTask = _debugger.WaitUntilReadyAsync();
-                using var client = await ConnectClientAsync(port);
-                await SendRequestAsync(client.GetStream(), new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "configurationDone"
-                });
-
-                await waitTask;
-                cts.Cancel();
-
-                // In the real runner, JobRunner always calls OnJobCompletedAsync
-                // from a finally block. The cancellation callback only unblocks
-                // pending waits; OnJobCompletedAsync handles state + cleanup.
-                await _debugger.OnJobCompletedAsync();
-                Assert.Equal(DapSessionState.Terminated, _debugger.State);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StopWithoutStartDoesNotThrow()
-        {
-            using (CreateTestContext())
-            {
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task OnJobCompletedTerminatesSession()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-
-                var waitTask = _debugger.WaitUntilReadyAsync();
-                using var client = await ConnectClientAsync(port);
-                await SendRequestAsync(client.GetStream(), new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "configurationDone"
-                });
-
-                await waitTask;
-                await _debugger.OnJobCompletedAsync();
-                Assert.Equal(DapSessionState.Terminated, _debugger.State);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task WaitUntilReadyBeforeStartIsNoOp()
-        {
-            using (CreateTestContext())
-            {
-                await _debugger.WaitUntilReadyAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task WaitUntilReadyJobCancellationPropagatesAsOperationCancelledException()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-
-                var waitTask = _debugger.WaitUntilReadyAsync();
-                await Task.Delay(50);
-                cts.Cancel();
-
-                var ex = await Assert.ThrowsAnyAsync<OperationCanceledException>(() => waitTask);
-                Assert.IsNotType<TimeoutException>(ex);
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task InitializeRequestOverSocketPreservesProtocolMetadataWhenSecretsCollide()
-        {
-            using (var hc = CreateTestContext())
-            {
-                hc.SecretMasker.AddValue("response");
-                hc.SecretMasker.AddValue("initialize");
-                hc.SecretMasker.AddValue("event");
-                hc.SecretMasker.AddValue("initialized");
-
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-                using var client = await ConnectClientAsync(port);
-                var stream = client.GetStream();
-
-                await SendRequestAsync(stream, new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "initialize"
-                });
-
-                var response = await ReadDapMessageAsync(stream, TimeSpan.FromSeconds(5));
-                Assert.Contains("\"type\":\"response\"", response);
-                Assert.Contains("\"command\":\"initialize\"", response);
-                Assert.Contains("\"success\":true", response);
-
-                var initializedEvent = await ReadDapMessageAsync(stream, TimeSpan.FromSeconds(5));
-                Assert.Contains("\"type\":\"event\"", initializedEvent);
-                Assert.Contains("\"event\":\"initialized\"", initializedEvent);
-
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task CancellationDuringStepPauseReleasesWait()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-
-                // Complete handshake so session is ready
-                var waitTask = _debugger.WaitUntilReadyAsync();
-                using var client = await ConnectClientAsync(port);
-                var stream = client.GetStream();
-                await SendRequestAsync(stream, new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "configurationDone"
-                });
-                await waitTask;
-
-                // Simulate a step starting (which pauses)
-                var step = new Mock<IStep>();
-                step.Setup(s => s.DisplayName).Returns("Test Step");
-                step.Setup(s => s.ExecutionContext).Returns((IExecutionContext)null);
-                var stepTask = _debugger.OnStepStartingAsync(step.Object);
-
-                // Give the step time to pause
-                await Task.Delay(50);
-
-                // Cancel the job — should release the step pause
-                cts.Cancel();
-                await stepTask;
-
-                // In the real runner, OnJobCompletedAsync always follows.
-                await _debugger.OnJobCompletedAsync();
-                Assert.Equal(DapSessionState.Terminated, _debugger.State);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task StopAsyncSafeAtAnyLifecyclePoint()
-        {
-            using (CreateTestContext())
-            {
-                // StopAsync before start
-                await _debugger.StopAsync();
-
-                // Start then immediate stop (no connection, no WaitUntilReady)
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-                await _debugger.StopAsync();
-
-                // StopAsync after already stopped
-                await _debugger.StopAsync();
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task OnJobCompletedSendsTerminatedAndExitedEvents()
-        {
-            using (CreateTestContext())
-            {
-                var port = GetFreePort();
-                using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                var jobContext = CreateJobContextWithTunnel(cts.Token, port);
-                await _debugger.StartAsync(jobContext.Object);
-
-                var waitTask = _debugger.WaitUntilReadyAsync();
-                using var client = await ConnectClientAsync(port);
-                var stream = client.GetStream();
-                await SendRequestAsync(stream, new Request
-                {
-                    Seq = 1,
-                    Type = "request",
-                    Command = "configurationDone"
-                });
-
-                // Read the configurationDone response
-                await ReadDapMessageAsync(stream, TimeSpan.FromSeconds(5));
-                await waitTask;
-
-                // Complete the job — events are sent via OnJobCompletedAsync
-                await _debugger.OnJobCompletedAsync();
-
-                var msg1 = await ReadDapMessageAsync(stream, TimeSpan.FromSeconds(5));
-                var msg2 = await ReadDapMessageAsync(stream, TimeSpan.FromSeconds(5));
-
-                // Both events should arrive (order may vary)
-                var combined = msg1 + msg2;
-                Assert.Contains("\"event\":\"terminated\"", combined);
-                Assert.Contains("\"event\":\"exited\"", combined);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTunnelConnectTimeoutReturnsDefaultWhenNoVariable()
-        {
-            using (CreateTestContext())
-            {
-                Assert.Equal(30, _debugger.ResolveTunnelConnectTimeout());
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTunnelConnectTimeoutUsesCustomValue()
-        {
-            using (CreateTestContext())
-            {
-                WithEnvironmentVariable(TunnelConnectTimeoutVariable, "60", () =>
-                {
-                    Assert.Equal(60, _debugger.ResolveTunnelConnectTimeout());
-                });
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTunnelConnectTimeoutIgnoresInvalidValue()
-        {
-            using (CreateTestContext())
-            {
-                WithEnvironmentVariable(TunnelConnectTimeoutVariable, "not-a-number", () =>
-                {
-                    Assert.Equal(30, _debugger.ResolveTunnelConnectTimeout());
-                });
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveTunnelConnectTimeoutIgnoresZeroValue()
-        {
-            using (CreateTestContext())
-            {
-                WithEnvironmentVariable(TunnelConnectTimeoutVariable, "0", () =>
-                {
-                    Assert.Equal(30, _debugger.ResolveTunnelConnectTimeout());
-                });
-            }
-        }
-    }
-}

src/Test/L0/Worker/DapMessagesL0.cs

@@ -1,233 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Xunit;
-using GitHub.Runner.Worker.Dap;
-
-namespace GitHub.Runner.Common.Tests.Worker
-{
-    public sealed class DapMessagesL0
-    {
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void RequestSerializesCorrectly()
-        {
-            var request = new Request
-            {
-                Seq = 1,
-                Type = "request",
-                Command = "initialize",
-                Arguments = JObject.FromObject(new { clientID = "test-client" })
-            };
-
-            var json = JsonConvert.SerializeObject(request);
-            var deserialized = JsonConvert.DeserializeObject<Request>(json);
-
-            Assert.Equal(1, deserialized.Seq);
-            Assert.Equal("request", deserialized.Type);
-            Assert.Equal("initialize", deserialized.Command);
-            Assert.Equal("test-client", deserialized.Arguments["clientID"].ToString());
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResponseSerializesCorrectly()
-        {
-            var response = new Response
-            {
-                Seq = 2,
-                Type = "response",
-                RequestSeq = 1,
-                Success = true,
-                Command = "initialize",
-                Body = new Capabilities { SupportsConfigurationDoneRequest = true }
-            };
-
-            var json = JsonConvert.SerializeObject(response);
-            var deserialized = JsonConvert.DeserializeObject<Response>(json);
-
-            Assert.Equal(2, deserialized.Seq);
-            Assert.Equal("response", deserialized.Type);
-            Assert.Equal(1, deserialized.RequestSeq);
-            Assert.True(deserialized.Success);
-            Assert.Equal("initialize", deserialized.Command);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EventSerializesWithCorrectType()
-        {
-            var evt = new Event
-            {
-                EventType = "stopped",
-                Body = new StoppedEventBody
-                {
-                    Reason = "entry",
-                    Description = "Stopped at entry",
-                    ThreadId = 1,
-                    AllThreadsStopped = true
-                }
-            };
-
-            Assert.Equal("event", evt.Type);
-
-            var json = JsonConvert.SerializeObject(evt);
-            Assert.Contains("\"type\":\"event\"", json);
-            Assert.Contains("\"event\":\"stopped\"", json);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void StoppedEventBodyOmitsNullFields()
-        {
-            var body = new StoppedEventBody
-            {
-                Reason = "step"
-            };
-
-            var json = JsonConvert.SerializeObject(body);
-            Assert.Contains("\"reason\":\"step\"", json);
-            Assert.DoesNotContain("\"threadId\"", json);
-            Assert.DoesNotContain("\"allThreadsStopped\"", json);
-            Assert.DoesNotContain("\"description\"", json);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void CapabilitiesMvpDefaults()
-        {
-            var caps = new Capabilities
-            {
-                SupportsConfigurationDoneRequest = true,
-                SupportsFunctionBreakpoints = false,
-                SupportsStepBack = false
-            };
-
-            var json = JsonConvert.SerializeObject(caps);
-            var deserialized = JsonConvert.DeserializeObject<Capabilities>(json);
-
-            Assert.True(deserialized.SupportsConfigurationDoneRequest);
-            Assert.False(deserialized.SupportsFunctionBreakpoints);
-            Assert.False(deserialized.SupportsStepBack);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ContinueResponseBodySerialization()
-        {
-            var body = new ContinueResponseBody { AllThreadsContinued = true };
-            var json = JsonConvert.SerializeObject(body);
-            var deserialized = JsonConvert.DeserializeObject<ContinueResponseBody>(json);
-
-            Assert.True(deserialized.AllThreadsContinued);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ThreadsResponseBodySerialization()
-        {
-            var body = new ThreadsResponseBody
-            {
-                Threads = new List<Thread>
-                {
-                    new Thread { Id = 1, Name = "Job Thread" }
-                }
-            };
-
-            var json = JsonConvert.SerializeObject(body);
-            var deserialized = JsonConvert.DeserializeObject<ThreadsResponseBody>(json);
-
-            Assert.Single(deserialized.Threads);
-            Assert.Equal(1, deserialized.Threads[0].Id);
-            Assert.Equal("Job Thread", deserialized.Threads[0].Name);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void StackFrameSerialization()
-        {
-            var frame = new StackFrame
-            {
-                Id = 1,
-                Name = "Step: Checkout",
-                Line = 1,
-                Column = 1,
-                PresentationHint = "normal"
-            };
-
-            var json = JsonConvert.SerializeObject(frame);
-            var deserialized = JsonConvert.DeserializeObject<StackFrame>(json);
-
-            Assert.Equal(1, deserialized.Id);
-            Assert.Equal("Step: Checkout", deserialized.Name);
-            Assert.Equal("normal", deserialized.PresentationHint);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ExitedEventBodySerialization()
-        {
-            var body = new ExitedEventBody { ExitCode = 130 };
-            var json = JsonConvert.SerializeObject(body);
-            var deserialized = JsonConvert.DeserializeObject<ExitedEventBody>(json);
-
-            Assert.Equal(130, deserialized.ExitCode);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void DapCommandEnumValues()
-        {
-            Assert.Equal(0, (int)DapCommand.Continue);
-            Assert.Equal(1, (int)DapCommand.Next);
-            Assert.Equal(4, (int)DapCommand.Disconnect);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void RequestDeserializesFromRawJson()
-        {
-            var json = @"{""seq"":5,""type"":""request"",""command"":""continue"",""arguments"":{""threadId"":1}}";
-            var request = JsonConvert.DeserializeObject<Request>(json);
-
-            Assert.Equal(5, request.Seq);
-            Assert.Equal("request", request.Type);
-            Assert.Equal("continue", request.Command);
-            Assert.Equal(1, request.Arguments["threadId"].Value<int>());
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ErrorResponseBodySerialization()
-        {
-            var body = new ErrorResponseBody
-            {
-                Error = new Message
-                {
-                    Id = 1,
-                    Format = "Something went wrong",
-                    ShowUser = true
-                }
-            };
-
-            var json = JsonConvert.SerializeObject(body);
-            var deserialized = JsonConvert.DeserializeObject<ErrorResponseBody>(json);
-
-            Assert.Equal(1, deserialized.Error.Id);
-            Assert.Equal("Something went wrong", deserialized.Error.Format);
-            Assert.True(deserialized.Error.ShowUser);
-        }
-    }
-}

src/Test/L0/Worker/DapReplExecutorL0.cs

@@ -1,237 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using GitHub.DistributedTask.Expressions2;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.Runner.Common.Tests;
-using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Dap;
-using Moq;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Worker
-{
-    public sealed class DapReplExecutorL0
-    {
-        private TestHostContext _hc;
-        private DapReplExecutor _executor;
-        private List<Event> _sentEvents;
-
-        private TestHostContext CreateTestContext([CallerMemberName] string testName = "")
-        {
-            _hc = new TestHostContext(this, testName);
-            _sentEvents = new List<Event>();
-            _executor = new DapReplExecutor(_hc, (category, text) =>
-            {
-                _sentEvents.Add(new Event
-                {
-                    EventType = "output",
-                    Body = new OutputEventBody
-                    {
-                        Category = category,
-                        Output = text
-                    }
-                });
-            });
-            return _hc;
-        }
-
-        private Mock<IExecutionContext> CreateMockContext(
-            DictionaryContextData exprValues = null,
-            IDictionary<string, IDictionary<string, string>> jobDefaults = null)
-        {
-            var mock = new Mock<IExecutionContext>();
-            mock.Setup(x => x.ExpressionValues).Returns(exprValues ?? new DictionaryContextData());
-            mock.Setup(x => x.ExpressionFunctions).Returns(new List<IFunctionInfo>());
-
-            var global = new GlobalContext
-            {
-                PrependPath = new List<string>(),
-                JobDefaults = jobDefaults
-                    ?? new Dictionary<string, IDictionary<string, string>>(StringComparer.OrdinalIgnoreCase),
-            };
-            mock.Setup(x => x.Global).Returns(global);
-
-            return mock;
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public async Task ExecuteRunCommand_NullContext_ReturnsError()
-        {
-            using (CreateTestContext())
-            {
-                var command = new RunCommand { Script = "echo hello" };
-                var result = await _executor.ExecuteRunCommandAsync(command, null, CancellationToken.None);
-
-                Assert.Equal("error", result.Type);
-                Assert.Contains("No execution context available", result.Result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ExpandExpressions_NoExpressions_ReturnsInput()
-        {
-            using (CreateTestContext())
-            {
-                var context = CreateMockContext();
-                var result = _executor.ExpandExpressions("echo hello", context.Object);
-
-                Assert.Equal("echo hello", result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ExpandExpressions_NullInput_ReturnsEmpty()
-        {
-            using (CreateTestContext())
-            {
-                var context = CreateMockContext();
-                var result = _executor.ExpandExpressions(null, context.Object);
-
-                Assert.Equal(string.Empty, result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ExpandExpressions_EmptyInput_ReturnsEmpty()
-        {
-            using (CreateTestContext())
-            {
-                var context = CreateMockContext();
-                var result = _executor.ExpandExpressions("", context.Object);
-
-                Assert.Equal(string.Empty, result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ExpandExpressions_UnterminatedExpression_KeepsLiteral()
-        {
-            using (CreateTestContext())
-            {
-                var context = CreateMockContext();
-                var result = _executor.ExpandExpressions("echo ${{ github.repo", context.Object);
-
-                Assert.Equal("echo ${{ github.repo", result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveDefaultShell_NoJobDefaults_ReturnsPlatformDefault()
-        {
-            using (CreateTestContext())
-            {
-                var context = CreateMockContext();
-                var result = _executor.ResolveDefaultShell(context.Object);
-
-#if OS_WINDOWS
-                Assert.True(result == "pwsh" || result == "powershell");
-#else
-                Assert.Equal("sh", result);
-#endif
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ResolveDefaultShell_WithJobDefault_ReturnsJobDefault()
-        {
-            using (CreateTestContext())
-            {
-                var jobDefaults = new Dictionary<string, IDictionary<string, string>>(StringComparer.OrdinalIgnoreCase)
-                {
-                    ["run"] = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-                    {
-                        ["shell"] = "bash"
-                    }
-                };
-                var context = CreateMockContext(jobDefaults: jobDefaults);
-                var result = _executor.ResolveDefaultShell(context.Object);
-
-                Assert.Equal("bash", result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void BuildEnvironment_MergesEnvContextAndReplOverrides()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                var envData = new DictionaryContextData
-                {
-                    ["FOO"] = new StringContextData("bar"),
-                };
-                exprValues["env"] = envData;
-
-                var context = CreateMockContext(exprValues);
-                var replEnv = new Dictionary<string, string> { { "BAZ", "qux" } };
-                var result = _executor.BuildEnvironment(context.Object, replEnv);
-
-                Assert.Equal("bar", result["FOO"]);
-                Assert.Equal("qux", result["BAZ"]);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void BuildEnvironment_ReplOverridesWin()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                var envData = new DictionaryContextData
-                {
-                    ["FOO"] = new StringContextData("original"),
-                };
-                exprValues["env"] = envData;
-
-                var context = CreateMockContext(exprValues);
-                var replEnv = new Dictionary<string, string> { { "FOO", "override" } };
-                var result = _executor.BuildEnvironment(context.Object, replEnv);
-
-                Assert.Equal("override", result["FOO"]);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void BuildEnvironment_NullReplEnv_ReturnsContextEnvOnly()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                var envData = new DictionaryContextData
-                {
-                    ["FOO"] = new StringContextData("bar"),
-                };
-                exprValues["env"] = envData;
-
-                var context = CreateMockContext(exprValues);
-                var result = _executor.BuildEnvironment(context.Object, null);
-
-                Assert.Equal("bar", result["FOO"]);
-                Assert.False(result.ContainsKey("BAZ"));
-            }
-        }
-    }
-}

src/Test/L0/Worker/DapReplParserL0.cs

@@ -1,314 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using GitHub.Runner.Common.Tests;
-using GitHub.Runner.Worker.Dap;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Worker
-{
-    public sealed class DapReplParserL0
-    {
-        #region help command
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_HelpReturnsHelpCommand()
-        {
-            var cmd = DapReplParser.TryParse("help", out var error);
-
-            Assert.Null(error);
-            var help = Assert.IsType<HelpCommand>(cmd);
-            Assert.Null(help.Topic);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_HelpCaseInsensitive()
-        {
-            var cmd = DapReplParser.TryParse("Help", out var error);
-            Assert.Null(error);
-            Assert.IsType<HelpCommand>(cmd);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_HelpWithTopic()
-        {
-            var cmd = DapReplParser.TryParse("help(\"run\")", out var error);
-
-            Assert.Null(error);
-            var help = Assert.IsType<HelpCommand>(cmd);
-            Assert.Equal("run", help.Topic);
-        }
-
-        #endregion
-
-        #region run command — basic
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunSimpleScript()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo hello\")", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("echo hello", run.Script);
-            Assert.Null(run.Shell);
-            Assert.Null(run.Env);
-            Assert.Null(run.WorkingDirectory);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithShell()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo hello\", shell: \"bash\")", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("echo hello", run.Script);
-            Assert.Equal("bash", run.Shell);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithWorkingDirectory()
-        {
-            var cmd = DapReplParser.TryParse("run(\"ls\", working_directory: \"/tmp\")", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("ls", run.Script);
-            Assert.Equal("/tmp", run.WorkingDirectory);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithEnv()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo $FOO\", env: { FOO: \"bar\" })", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("echo $FOO", run.Script);
-            Assert.NotNull(run.Env);
-            Assert.Equal("bar", run.Env["FOO"]);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithMultipleEnvVars()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo\", env: { A: \"1\", B: \"2\" })", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal(2, run.Env.Count);
-            Assert.Equal("1", run.Env["A"]);
-            Assert.Equal("2", run.Env["B"]);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithAllOptions()
-        {
-            var input = "run(\"echo $X\", shell: \"zsh\", env: { X: \"1\" }, working_directory: \"/tmp\")";
-            var cmd = DapReplParser.TryParse(input, out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("echo $X", run.Script);
-            Assert.Equal("zsh", run.Shell);
-            Assert.Equal("1", run.Env["X"]);
-            Assert.Equal("/tmp", run.WorkingDirectory);
-        }
-
-        #endregion
-
-        #region run command — edge cases
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithEscapedQuotes()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo \\\"hello\\\"\")", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("echo \"hello\"", run.Script);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunWithCommaInEnvValue()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo\", env: { CSV: \"a,b,c\" })", out var error);
-
-            Assert.Null(error);
-            var run = Assert.IsType<RunCommand>(cmd);
-            Assert.Equal("a,b,c", run.Env["CSV"]);
-        }
-
-        #endregion
-
-        #region error cases
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunEmptyArgsReturnsError()
-        {
-            var cmd = DapReplParser.TryParse("run()", out var error);
-
-            Assert.NotNull(error);
-            Assert.Null(cmd);
-            Assert.Contains("requires a script argument", error);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunUnquotedArgReturnsError()
-        {
-            var cmd = DapReplParser.TryParse("run(echo hello)", out var error);
-
-            Assert.NotNull(error);
-            Assert.Null(cmd);
-            Assert.Contains("quoted string", error);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunUnknownOptionReturnsError()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo\", timeout: \"10\")", out var error);
-
-            Assert.NotNull(error);
-            Assert.Null(cmd);
-            Assert.Contains("Unknown option", error);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_RunMissingClosingParenReturnsError()
-        {
-            var cmd = DapReplParser.TryParse("run(\"echo\"", out var error);
-
-            Assert.NotNull(error);
-            Assert.Null(cmd);
-        }
-
-        #endregion
-
-        #region non-DSL input falls through
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_ExpressionReturnsNull()
-        {
-            var cmd = DapReplParser.TryParse("github.repository", out var error);
-
-            Assert.Null(error);
-            Assert.Null(cmd);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_WrappedExpressionReturnsNull()
-        {
-            var cmd = DapReplParser.TryParse("${{ github.event_name }}", out var error);
-
-            Assert.Null(error);
-            Assert.Null(cmd);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Parse_EmptyInputReturnsNull()
-        {
-            var cmd = DapReplParser.TryParse("", out var error);
-            Assert.Null(error);
-            Assert.Null(cmd);
-
-            cmd = DapReplParser.TryParse(null, out error);
-            Assert.Null(error);
-            Assert.Null(cmd);
-        }
-
-        #endregion
-
-        #region help text
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetGeneralHelp_ContainsCommands()
-        {
-            var help = DapReplParser.GetGeneralHelp();
-
-            Assert.Contains("help", help);
-            Assert.Contains("run", help);
-            Assert.Contains("expression", help, System.StringComparison.OrdinalIgnoreCase);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetRunHelp_ContainsOptions()
-        {
-            var help = DapReplParser.GetRunHelp();
-
-            Assert.Contains("shell", help);
-            Assert.Contains("env", help);
-            Assert.Contains("working_directory", help);
-        }
-
-        #endregion
-
-        #region internal parser helpers
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void SplitArguments_HandlesNestedBraces()
-        {
-            var args = DapReplParser.SplitArguments("\"hello\", env: { A: \"1\", B: \"2\" }", out var error);
-
-            Assert.Null(error);
-            Assert.Equal(2, args.Count);
-            Assert.Equal("\"hello\"", args[0].Trim());
-            Assert.Contains("A:", args[1]);
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void ParseEnvBlock_HandlesEmptyBlock()
-        {
-            var result = DapReplParser.ParseEnvBlock("{ }", out var error);
-
-            Assert.Null(error);
-            Assert.NotNull(result);
-            Assert.Empty(result);
-        }
-
-        #endregion
-    }
-}

src/Test/L0/Worker/DapVariableProviderL0.cs

@@ -1,728 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using GitHub.DistributedTask.Pipelines.ContextData;
-using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common;
-using GitHub.Runner.Common.Tests;
-using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Dap;
-using Xunit;
-
-namespace GitHub.Runner.Common.Tests.Worker
-{
-    public sealed class DapVariableProviderL0
-    {
-        private TestHostContext _hc;
-        private DapVariableProvider _provider;
-
-        private TestHostContext CreateTestContext([CallerMemberName] string testName = "")
-        {
-            _hc = new TestHostContext(this, testName);
-            _provider = new DapVariableProvider(_hc.SecretMasker);
-            return _hc;
-        }
-
-        private Moq.Mock<GitHub.Runner.Worker.IExecutionContext> CreateMockContext(DictionaryContextData expressionValues)
-        {
-            var mock = new Moq.Mock<GitHub.Runner.Worker.IExecutionContext>();
-            mock.Setup(x => x.ExpressionValues).Returns(expressionValues);
-            return mock;
-        }
-
-        #region GetScopes tests
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetScopes_ReturnsEmptyWhenContextIsNull()
-        {
-            using (CreateTestContext())
-            {
-                var scopes = _provider.GetScopes(null);
-                Assert.Empty(scopes);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetScopes_ReturnsOnlyPopulatedScopes()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "repository", new StringContextData("owner/repo") }
-                };
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "CI", new StringContextData("true") },
-                    { "HOME", new StringContextData("/home/runner") }
-                };
-                // "runner" is not set — should not appear in scopes
-
-                var ctx = CreateMockContext(exprValues);
-                var scopes = _provider.GetScopes(ctx.Object);
-
-                Assert.Equal(2, scopes.Count);
-                Assert.Equal("github", scopes[0].Name);
-                Assert.Equal("env", scopes[1].Name);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetScopes_ReportsNamedVariableCount()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "A", new StringContextData("1") },
-                    { "B", new StringContextData("2") },
-                    { "C", new StringContextData("3") }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var scopes = _provider.GetScopes(ctx.Object);
-
-                Assert.Single(scopes);
-                Assert.Equal(3, scopes[0].NamedVariables);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetScopes_SecretsGetSpecialPresentationHint()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["secrets"] = new DictionaryContextData
-                {
-                    { "MY_SECRET", new StringContextData("super-secret") }
-                };
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "CI", new StringContextData("true") }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var scopes = _provider.GetScopes(ctx.Object);
-
-                var envScope = scopes.Find(s => s.Name == "env");
-                var secretsScope = scopes.Find(s => s.Name == "secrets");
-
-                Assert.NotNull(envScope);
-                Assert.Null(envScope.PresentationHint);
-
-                Assert.NotNull(secretsScope);
-                Assert.Equal("registers", secretsScope.PresentationHint);
-            }
-        }
-
-        #endregion
-
-        #region GetVariables — basic types
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_ReturnsEmptyWhenContextIsNull()
-        {
-            using (CreateTestContext())
-            {
-                var variables = _provider.GetVariables(null, 1);
-                Assert.Empty(variables);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_ReturnsStringVariables()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "CI", new StringContextData("true") },
-                    { "HOME", new StringContextData("/home/runner") }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                // "env" is at ScopeNames index 1 → variablesReference = 2
-                var variables = _provider.GetVariables(ctx.Object, 2);
-
-                Assert.Equal(2, variables.Count);
-
-                var ciVar = variables.Find(v => v.Name == "CI");
-                Assert.NotNull(ciVar);
-                Assert.Equal("true", ciVar.Value);
-                Assert.Equal("string", ciVar.Type);
-                Assert.Equal(0, ciVar.VariablesReference);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_ReturnsBooleanVariables()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "event_name", new StringContextData("push") },
-                };
-                // Use a nested dict with boolean to test
-                var jobDict = new DictionaryContextData();
-                // BooleanContextData is a valid PipelineContextData type
-                // but job context typically has strings. Use env scope instead.
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "flag", new BooleanContextData(true) }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                // "env" is at index 1 → ref 2
-                var variables = _provider.GetVariables(ctx.Object, 2);
-
-                var flagVar = variables.Find(v => v.Name == "flag");
-                Assert.NotNull(flagVar);
-                Assert.Equal("true", flagVar.Value);
-                Assert.Equal("boolean", flagVar.Type);
-                Assert.Equal(0, flagVar.VariablesReference);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_ReturnsNumberVariables()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "count", new NumberContextData(42) }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 2);
-
-                var countVar = variables.Find(v => v.Name == "count");
-                Assert.NotNull(countVar);
-                Assert.Equal("42", countVar.Value);
-                Assert.Equal("number", countVar.Type);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_HandlesNullValues()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                var dict = new DictionaryContextData();
-                dict["present"] = new StringContextData("yes");
-                dict["missing"] = null;
-                exprValues["env"] = dict;
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 2);
-
-                var nullVar = variables.Find(v => v.Name == "missing");
-                Assert.NotNull(nullVar);
-                Assert.Equal("null", nullVar.Value);
-                Assert.Equal("null", nullVar.Type);
-                Assert.Equal(0, nullVar.VariablesReference);
-            }
-        }
-
-        #endregion
-
-        #region GetVariables — nested expansion
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_NestedDictionaryIsExpandable()
-        {
-            using (CreateTestContext())
-            {
-                var innerDict = new DictionaryContextData
-                {
-                    { "name", new StringContextData("push") },
-                    { "ref", new StringContextData("refs/heads/main") }
-                };
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "event", innerDict }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                // "github" is at index 0 → ref 1
-                var variables = _provider.GetVariables(ctx.Object, 1);
-
-                var eventVar = variables.Find(v => v.Name == "event");
-                Assert.NotNull(eventVar);
-                Assert.Equal("object", eventVar.Type);
-                Assert.True(eventVar.VariablesReference > 0, "Nested dict should have a non-zero variablesReference");
-                Assert.Equal(2, eventVar.NamedVariables);
-
-                // Now expand it
-                var children = _provider.GetVariables(ctx.Object, eventVar.VariablesReference);
-                Assert.Equal(2, children.Count);
-
-                var nameVar = children.Find(v => v.Name == "name");
-                Assert.NotNull(nameVar);
-                Assert.Equal("push", nameVar.Value);
-                Assert.Equal("${{ github.event.name }}", nameVar.EvaluateName);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_NestedArrayIsExpandable()
-        {
-            using (CreateTestContext())
-            {
-                var array = new ArrayContextData();
-                array.Add(new StringContextData("item0"));
-                array.Add(new StringContextData("item1"));
-
-                var exprValues = new DictionaryContextData();
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "list", array }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 2);
-
-                var listVar = variables.Find(v => v.Name == "list");
-                Assert.NotNull(listVar);
-                Assert.Equal("array", listVar.Type);
-                Assert.True(listVar.VariablesReference > 0);
-                Assert.Equal(2, listVar.IndexedVariables);
-
-                // Expand the array
-                var items = _provider.GetVariables(ctx.Object, listVar.VariablesReference);
-                Assert.Equal(2, items.Count);
-                Assert.Equal("[0]", items[0].Name);
-                Assert.Equal("item0", items[0].Value);
-                Assert.Equal("[1]", items[1].Name);
-                Assert.Equal("item1", items[1].Value);
-            }
-        }
-
-        #endregion
-
-        #region Secret masking
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_SecretsScopeValuesAreRedacted()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["secrets"] = new DictionaryContextData
-                {
-                    { "MY_TOKEN", new StringContextData("ghp_abc123secret") },
-                    { "DB_PASSWORD", new StringContextData("p@ssword!") }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                // "secrets" is at index 5 → ref 6
-                var variables = _provider.GetVariables(ctx.Object, 6);
-
-                Assert.Equal(2, variables.Count);
-                foreach (var v in variables)
-                {
-                    Assert.Equal("***", v.Value);
-                    Assert.Equal("string", v.Type);
-                }
-
-                // Keys should still be visible
-                Assert.Contains(variables, v => v.Name == "MY_TOKEN");
-                Assert.Contains(variables, v => v.Name == "DB_PASSWORD");
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_NonSecretScopeValuesMaskedBySecretMasker()
-        {
-            using (var hc = CreateTestContext())
-            {
-                // Register a known secret value with the masker
-                hc.SecretMasker.AddValue("super-secret-token");
-
-                var exprValues = new DictionaryContextData();
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "SAFE", new StringContextData("hello world") },
-                    { "LEAKED", new StringContextData("prefix-super-secret-token-suffix") }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 2);
-
-                var safeVar = variables.Find(v => v.Name == "SAFE");
-                Assert.NotNull(safeVar);
-                Assert.Equal("hello world", safeVar.Value);
-
-                var leakedVar = variables.Find(v => v.Name == "LEAKED");
-                Assert.NotNull(leakedVar);
-                Assert.DoesNotContain("super-secret-token", leakedVar.Value);
-                Assert.Contains("***", leakedVar.Value);
-            }
-        }
-
-        #endregion
-
-        #region Reset
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void Reset_InvalidatesNestedReferences()
-        {
-            using (CreateTestContext())
-            {
-                var innerDict = new DictionaryContextData
-                {
-                    { "name", new StringContextData("push") }
-                };
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "event", innerDict }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 1);
-                var eventVar = variables.Find(v => v.Name == "event");
-                Assert.True(eventVar.VariablesReference > 0);
-
-                var savedRef = eventVar.VariablesReference;
-
-                // Reset should clear all dynamic references
-                _provider.Reset();
-
-                var children = _provider.GetVariables(ctx.Object, savedRef);
-                Assert.Empty(children);
-            }
-        }
-
-        #endregion
-
-        #region EvaluateName
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_SetsEvaluateNameWithDotPath()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "repository", new StringContextData("owner/repo") }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 1);
-
-                var repoVar = variables.Find(v => v.Name == "repository");
-                Assert.NotNull(repoVar);
-                Assert.Equal("${{ github.repository }}", repoVar.EvaluateName);
-            }
-        }
-
-        #endregion
-
-        #region EvaluateExpression
-
-        /// <summary>
-        /// Creates a mock execution context with Global set up so that
-        /// ToPipelineTemplateEvaluator() works for real expression evaluation.
-        /// </summary>
-        private Moq.Mock<IExecutionContext> CreateEvaluatableContext(
-            TestHostContext hc,
-            DictionaryContextData expressionValues)
-        {
-            var mock = new Moq.Mock<IExecutionContext>();
-            mock.Setup(x => x.ExpressionValues).Returns(expressionValues);
-            mock.Setup(x => x.ExpressionFunctions)
-                .Returns(new List<GitHub.DistributedTask.Expressions2.IFunctionInfo>());
-            mock.Setup(x => x.Global).Returns(new GlobalContext
-            {
-                FileTable = new List<string>(),
-                Variables = new Variables(hc, new Dictionary<string, VariableValue>()),
-            });
-            // ToPipelineTemplateEvaluator uses ToTemplateTraceWriter which calls
-            // context.Write — provide a no-op so it doesn't NRE.
-            mock.Setup(x => x.Write(Moq.It.IsAny<string>(), Moq.It.IsAny<string>()));
-            return mock;
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EvaluateExpression_ReturnsValueForSimpleExpression()
-        {
-            using (var hc = CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "repository", new StringContextData("owner/repo") }
-                };
-
-                var ctx = CreateEvaluatableContext(hc, exprValues);
-                var result = _provider.EvaluateExpression("github.repository", ctx.Object);
-
-                Assert.Equal("owner/repo", result.Result);
-                Assert.Equal("string", result.Type);
-                Assert.Equal(0, result.VariablesReference);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EvaluateExpression_StripsWrapperSyntax()
-        {
-            using (var hc = CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData
-                {
-                    { "event_name", new StringContextData("push") }
-                };
-
-                var ctx = CreateEvaluatableContext(hc, exprValues);
-                var result = _provider.EvaluateExpression("${{ github.event_name }}", ctx.Object);
-
-                Assert.Equal("push", result.Result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EvaluateExpression_MasksSecretInResult()
-        {
-            using (var hc = CreateTestContext())
-            {
-                hc.SecretMasker.AddValue("super-secret");
-
-                var exprValues = new DictionaryContextData();
-                exprValues["env"] = new DictionaryContextData
-                {
-                    { "TOKEN", new StringContextData("super-secret") }
-                };
-
-                var ctx = CreateEvaluatableContext(hc, exprValues);
-                var result = _provider.EvaluateExpression("env.TOKEN", ctx.Object);
-
-                Assert.DoesNotContain("super-secret", result.Result);
-                Assert.Contains("***", result.Result);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EvaluateExpression_ReturnsErrorForInvalidExpression()
-        {
-            using (var hc = CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["github"] = new DictionaryContextData();
-
-                var ctx = CreateEvaluatableContext(hc, exprValues);
-                // An invalid expression syntax should not throw — it should
-                // return an error result.
-                var result = _provider.EvaluateExpression("!!!invalid[[", ctx.Object);
-
-                Assert.Contains("error", result.Result, StringComparison.OrdinalIgnoreCase);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EvaluateExpression_ReturnsMessageWhenNoContext()
-        {
-            using (CreateTestContext())
-            {
-                var result = _provider.EvaluateExpression("github.repository", null);
-
-                Assert.Contains("no execution context", result.Result, StringComparison.OrdinalIgnoreCase);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void EvaluateExpression_ReturnsEmptyForEmptyExpression()
-        {
-            using (var hc = CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                var ctx = CreateEvaluatableContext(hc, exprValues);
-                var result = _provider.EvaluateExpression("", ctx.Object);
-
-                Assert.Equal(string.Empty, result.Result);
-            }
-        }
-
-        #endregion
-
-        #region InferResultType
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void InferResultType_ClassifiesCorrectly()
-        {
-            using (CreateTestContext())
-            {
-                Assert.Equal("null", DapVariableProvider.InferResultType(null));
-                Assert.Equal("null", DapVariableProvider.InferResultType("null"));
-                Assert.Equal("boolean", DapVariableProvider.InferResultType("true"));
-                Assert.Equal("boolean", DapVariableProvider.InferResultType("false"));
-                Assert.Equal("number", DapVariableProvider.InferResultType("42"));
-                Assert.Equal("number", DapVariableProvider.InferResultType("3.14"));
-                Assert.Equal("object", DapVariableProvider.InferResultType("{\"key\":\"val\"}"));
-                Assert.Equal("object", DapVariableProvider.InferResultType("[1,2,3]"));
-                Assert.Equal("string", DapVariableProvider.InferResultType("hello world"));
-                Assert.Equal("string", DapVariableProvider.InferResultType("owner/repo"));
-            }
-        }
-
-        #endregion
-
-        #region Non-string secret type redaction
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_SecretsScopeRedactsNumberContextData()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["secrets"] = new DictionaryContextData
-                {
-                    { "NUMERIC_SECRET", new NumberContextData(12345) }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 6);
-
-                Assert.Single(variables);
-                Assert.Equal("NUMERIC_SECRET", variables[0].Name);
-                Assert.Equal("***", variables[0].Value);
-                Assert.Equal("string", variables[0].Type);
-                Assert.Equal(0, variables[0].VariablesReference);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_SecretsScopeRedactsBooleanContextData()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["secrets"] = new DictionaryContextData
-                {
-                    { "BOOL_SECRET", new BooleanContextData(true) }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 6);
-
-                Assert.Single(variables);
-                Assert.Equal("BOOL_SECRET", variables[0].Name);
-                Assert.Equal("***", variables[0].Value);
-                Assert.Equal("string", variables[0].Type);
-                Assert.Equal(0, variables[0].VariablesReference);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_SecretsScopeRedactsNestedDictionary()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                exprValues["secrets"] = new DictionaryContextData
-                {
-                    { "NESTED_SECRET", new DictionaryContextData
-                        {
-                            { "inner_key", new StringContextData("inner_value") }
-                        }
-                    }
-                };
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 6);
-
-                Assert.Single(variables);
-                Assert.Equal("NESTED_SECRET", variables[0].Name);
-                Assert.Equal("***", variables[0].Value);
-                Assert.Equal("string", variables[0].Type);
-                // Nested container should NOT be drillable under secrets
-                Assert.Equal(0, variables[0].VariablesReference);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void GetVariables_SecretsScopeRedactsNullValue()
-        {
-            using (CreateTestContext())
-            {
-                var exprValues = new DictionaryContextData();
-                var secrets = new DictionaryContextData();
-                secrets["NULL_SECRET"] = null;
-                exprValues["secrets"] = secrets;
-
-                var ctx = CreateMockContext(exprValues);
-                var variables = _provider.GetVariables(ctx.Object, 6);
-
-                Assert.Single(variables);
-                Assert.Equal("NULL_SECRET", variables[0].Name);
-                Assert.Equal("***", variables[0].Value);
-                Assert.Equal(0, variables[0].VariablesReference);
-            }
-        }
-
-        #endregion
-    }
-}

src/Test/L0/Worker/ExecutionContextL0.cs

@@ -1203,19 +1203,19 @@ namespace GitHub.Runner.Common.Tests.Worker
             }
         }
 
-        // AddCheckRunIdToJobContext is now permanently enabled server-side (hardcoded to "true"
-        // in acquirejobhandler.go). The runner always copies ContextData["job"] entries, so the
-        // flag-disabled test is no longer applicable. Replaced with a test that verifies
-        // check_run_id is always hydrated regardless of the flag value.
+        // TODO: this test can be deleted when `AddCheckRunIdToJobContext` is fully rolled out
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public void InitializeJob_HydratesJobContextWithCheckRunId_AlwaysCopied()
+        public void InitializeJob_HydratesJobContextWithCheckRunId_FeatureFlagDisabled()
         {
             using (TestHostContext hc = CreateTestContext())
             {
-                // Arrange: No feature flag set at all
-                var variables = new Dictionary<string, VariableValue>();
+                // Arrange: Create a job request message and make sure the feature flag is disabled
+                var variables = new Dictionary<string, VariableValue>()
+                {
+                    [Constants.Runner.Features.AddCheckRunIdToJobContext] = new VariableValue("false"),
+                };
                 var jobRequest = new Pipelines.AgentJobRequestMessage(new TaskOrchestrationPlanReference(), new TimelineReference(), Guid.NewGuid(), "some job name", "some job name", null, null, null, variables, new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
                 var pagingLogger = new Moq.Mock<IPagingLogger>();
                 var jobServerQueue = new Moq.Mock<IJobServerQueue>();
@@ -1233,80 +1233,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Act
                 ec.InitializeJob(jobRequest, CancellationToken.None);
 
-                // Assert: check_run_id is always copied regardless of flag
+                // Assert
                 Assert.NotNull(ec.JobContext);
-                Assert.Equal(123456, ec.JobContext.CheckRunId);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void InitializeJob_HydratesJobContextWithWorkflowIdentity()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange
-                var variables = new Dictionary<string, VariableValue>();
-                var jobRequest = new Pipelines.AgentJobRequestMessage(new TaskOrchestrationPlanReference(), new TimelineReference(), Guid.NewGuid(), "some job name", "some job name", null, null, null, variables, new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
-                var pagingLogger = new Moq.Mock<IPagingLogger>();
-                var jobServerQueue = new Moq.Mock<IJobServerQueue>();
-                hc.EnqueueInstance(pagingLogger.Object);
-                hc.SetSingleton(jobServerQueue.Object);
-                var ec = new Runner.Worker.ExecutionContext();
-                ec.Initialize(hc);
-
-                // Arrange: Server sends all 4 workflow identity fields
-                var jobContext = new Pipelines.ContextData.DictionaryContextData();
-                jobContext["workflow_ref"] = new StringContextData("my-org/my-repo/.github/workflows/reusable.yml@refs/heads/main");
-                jobContext["workflow_sha"] = new StringContextData("abc123def456");
-                jobContext["workflow_repository"] = new StringContextData("my-org/my-repo");
-                jobContext["workflow_file_path"] = new StringContextData(".github/workflows/reusable.yml");
-                jobRequest.ContextData["job"] = jobContext;
-                jobRequest.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
-
-                // Act
-                ec.InitializeJob(jobRequest, CancellationToken.None);
-
-                // Assert: all properties hydrated from server
-                Assert.NotNull(ec.JobContext);
-                Assert.Equal("my-org/my-repo/.github/workflows/reusable.yml@refs/heads/main", ec.JobContext.WorkflowRef);
-                Assert.Equal("abc123def456", ec.JobContext.WorkflowSha);
-                Assert.Equal("my-org/my-repo", ec.JobContext.WorkflowRepository);
-                Assert.Equal(".github/workflows/reusable.yml", ec.JobContext.WorkflowFilePath);
-            }
-        }
-
-        [Fact]
-        [Trait("Level", "L0")]
-        [Trait("Category", "Worker")]
-        public void InitializeJob_WorkflowIdentityNotSet_WhenServerSendsNoData()
-        {
-            using (TestHostContext hc = CreateTestContext())
-            {
-                // Arrange: Server sends no workflow identity in job context
-                var variables = new Dictionary<string, VariableValue>();
-                var jobRequest = new Pipelines.AgentJobRequestMessage(new TaskOrchestrationPlanReference(), new TimelineReference(), Guid.NewGuid(), "some job name", "some job name", null, null, null, variables, new List<MaskHint>(), new Pipelines.JobResources(), new Pipelines.ContextData.DictionaryContextData(), new Pipelines.WorkspaceOptions(), new List<Pipelines.ActionStep>(), null, null, null, null, null);
-                var pagingLogger = new Moq.Mock<IPagingLogger>();
-                var jobServerQueue = new Moq.Mock<IJobServerQueue>();
-                hc.EnqueueInstance(pagingLogger.Object);
-                hc.SetSingleton(jobServerQueue.Object);
-                var ec = new Runner.Worker.ExecutionContext();
-                ec.Initialize(hc);
-
-                // Arrange: empty job context
-                jobRequest.ContextData["job"] = new Pipelines.ContextData.DictionaryContextData();
-                jobRequest.ContextData["github"] = new Pipelines.ContextData.DictionaryContextData();
-
-                // Act
-                ec.InitializeJob(jobRequest, CancellationToken.None);
-
-                // Assert: no workflow identity
-                Assert.NotNull(ec.JobContext);
-                Assert.Null(ec.JobContext.WorkflowRef);
-                Assert.Null(ec.JobContext.WorkflowSha);
-                Assert.Null(ec.JobContext.WorkflowRepository);
-                Assert.Null(ec.JobContext.WorkflowFilePath);
+                Assert.Null(ec.JobContext.CheckRunId); // with the feature flag disabled we should not have added a CheckRunId to the JobContext
             }
         }
 

src/Test/L0/Worker/JobContextL0.cs

@@ -34,109 +34,5 @@ namespace GitHub.Runner.Common.Tests.Worker
             ctx.CheckRunId = null;
             Assert.Null(ctx.CheckRunId);
         }
-
-        [Fact]
-        public void WorkflowRef_SetAndGet_WorksCorrectly()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowRef = "owner/repo/.github/workflows/ci.yml@refs/heads/main";
-            Assert.Equal("owner/repo/.github/workflows/ci.yml@refs/heads/main", ctx.WorkflowRef);
-            Assert.True(ctx.TryGetValue("workflow_ref", out var value));
-            Assert.IsType<StringContextData>(value);
-        }
-
-        [Fact]
-        public void WorkflowRef_NotSet_ReturnsNull()
-        {
-            var ctx = new JobContext();
-            Assert.Null(ctx.WorkflowRef);
-        }
-
-        [Fact]
-        public void WorkflowRef_SetNull_ClearsValue()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowRef = "owner/repo/.github/workflows/ci.yml@refs/heads/main";
-            ctx.WorkflowRef = null;
-            Assert.Null(ctx.WorkflowRef);
-        }
-
-        [Fact]
-        public void WorkflowSha_SetAndGet_WorksCorrectly()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowSha = "abc123def456";
-            Assert.Equal("abc123def456", ctx.WorkflowSha);
-            Assert.True(ctx.TryGetValue("workflow_sha", out var value));
-            Assert.IsType<StringContextData>(value);
-        }
-
-        [Fact]
-        public void WorkflowSha_NotSet_ReturnsNull()
-        {
-            var ctx = new JobContext();
-            Assert.Null(ctx.WorkflowSha);
-        }
-
-        [Fact]
-        public void WorkflowSha_SetNull_ClearsValue()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowSha = "abc123def456";
-            ctx.WorkflowSha = null;
-            Assert.Null(ctx.WorkflowSha);
-        }
-
-        [Fact]
-        public void WorkflowRepository_SetAndGet_WorksCorrectly()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowRepository = "owner/repo";
-            Assert.Equal("owner/repo", ctx.WorkflowRepository);
-            Assert.True(ctx.TryGetValue("workflow_repository", out var value));
-            Assert.IsType<StringContextData>(value);
-        }
-
-        [Fact]
-        public void WorkflowRepository_NotSet_ReturnsNull()
-        {
-            var ctx = new JobContext();
-            Assert.Null(ctx.WorkflowRepository);
-        }
-
-        [Fact]
-        public void WorkflowRepository_SetNull_ClearsValue()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowRepository = "owner/repo";
-            ctx.WorkflowRepository = null;
-            Assert.Null(ctx.WorkflowRepository);
-        }
-
-        [Fact]
-        public void WorkflowFilePath_SetAndGet_WorksCorrectly()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowFilePath = ".github/workflows/ci.yml";
-            Assert.Equal(".github/workflows/ci.yml", ctx.WorkflowFilePath);
-            Assert.True(ctx.TryGetValue("workflow_file_path", out var value));
-            Assert.IsType<StringContextData>(value);
-        }
-
-        [Fact]
-        public void WorkflowFilePath_NotSet_ReturnsNull()
-        {
-            var ctx = new JobContext();
-            Assert.Null(ctx.WorkflowFilePath);
-        }
-
-        [Fact]
-        public void WorkflowFilePath_SetNull_ClearsValue()
-        {
-            var ctx = new JobContext();
-            ctx.WorkflowFilePath = ".github/workflows/ci.yml";
-            ctx.WorkflowFilePath = null;
-            Assert.Null(ctx.WorkflowFilePath);
-        }
     }
 }

src/Test/L0/Worker/JobExtensionL0.cs

@@ -8,7 +8,6 @@ using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.DistributedTask.Pipelines.ObjectTemplating;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Dap;
 using Moq;
 using Xunit;
 using Pipelines = GitHub.DistributedTask.Pipelines;
@@ -548,10 +547,6 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 var _stepsRunner = new StepsRunner();
                 _stepsRunner.Initialize(hc);
-
-                var mockDapDebugger = new Mock<IDapDebugger>();
-                hc.SetSingleton(mockDapDebugger.Object);
-
                 await _stepsRunner.RunAsync(_jobEc);
 
                 Assert.Equal("Create custom image", snapshotStep.DisplayName);

src/Test/L0/Worker/StepsRunnerL0.cs

@@ -12,7 +12,6 @@ using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Dap;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
@@ -62,10 +61,6 @@ namespace GitHub.Runner.Common.Tests.Worker
 
             _stepsRunner = new StepsRunner();
             _stepsRunner.Initialize(hc);
-
-            var mockDapDebugger = new Mock<IDapDebugger>();
-            hc.SetSingleton(mockDapDebugger.Object);
-
             return hc;
         }
 

src/runnerversion

@@ -1 +1 @@
-2.333.0
+2.333.1