From b36d9a6c926f7ca06618079fbf3d8c8e556b4fde Mon Sep 17 00:00:00 2001
From: Francesco Renzi <rentziass@gmail.com>
Date: Mon, 16 Mar 2026 11:17:24 +0000
Subject: [PATCH] PR feedback

---
 src/Runner.Worker/Dap/DapDebugSession.cs |  7 +++---
 src/Runner.Worker/JobRunner.cs           | 31 ++++++++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/Runner.Worker/Dap/DapDebugSession.cs b/src/Runner.Worker/Dap/DapDebugSession.cs
index bdf5e85d2..9f6b044a1 100644
--- a/src/Runner.Worker/Dap/DapDebugSession.cs
+++ b/src/Runner.Worker/Dap/DapDebugSession.cs
@@ -192,10 +192,11 @@ namespace GitHub.Runner.Worker.Dap
             var capabilities = new Capabilities
             {
                 SupportsConfigurationDoneRequest = true,
+                SupportsEvaluateForHovers = true,
+
                 // All other capabilities are false for MVP
                 SupportsFunctionBreakpoints = false,
                 SupportsConditionalBreakpoints = false,
-                SupportsEvaluateForHovers = true,
                 SupportsStepBack = false,
                 SupportsSetVariable = false,
                 SupportsRestartFrame = false,
@@ -880,9 +881,7 @@ namespace GitHub.Runner.Worker.Dap
                 return value ?? string.Empty;
             }
 
-            return _variableProvider?.MaskSecrets(value)
-                ?? HostContext?.SecretMasker?.MaskSecrets(value)
-                ?? value;
+            return HostContext?.SecretMasker?.MaskSecrets(value);
         }
 
         /// <summary>
diff --git a/src/Runner.Worker/JobRunner.cs b/src/Runner.Worker/JobRunner.cs
index 4abf40317..9867eb251 100644
--- a/src/Runner.Worker/JobRunner.cs
+++ b/src/Runner.Worker/JobRunner.cs
@@ -195,7 +195,13 @@ namespace GitHub.Runner.Worker
                         Trace.Warning($"Failed to start DAP debugger: {ex.Message}. Job will continue without debugging.");
 
                         // cleanup if debugger failed to start
-                        try { await dapDebugger?.StopAsync(); } catch { }
+                        try {
+                            await dapDebugger.StopAsync();
+                        }
+                        catch {
+                            Trace.Error("Failed to stop debugger server")
+                            Trace.Error(ex);
+                        }
                         dapDebugger = null;
                     }
                 }
@@ -250,16 +256,15 @@ namespace GitHub.Runner.Worker
                     {
                         await dapDebugger.WaitUntilReadyAsync(jobRequestCancellationToken);
                     }
-                    catch (OperationCanceledException) when (jobRequestCancellationToken.IsCancellationRequested)
-                    {
-                        Trace.Info("Job was cancelled before debugger client connected. Continuing without debugger.");
-                        try { await dapDebugger.StopAsync(); } catch { }
-                        dapDebugger = null;
-                    }
                     catch (Exception ex)
                     {
-                        Trace.Warning($"Failed to complete DAP handshake: {ex.Message}. Job will continue without debugging.");
-                        try { await dapDebugger.StopAsync(); } catch { }
+                        try {
+                            await dapDebugger.StopAsync();
+                        }
+                        catch {
+                            Trace.Error("Failed to stop debugger server")
+                            Trace.Error(ex);
+                        }
                         dapDebugger = null;
                     }
                 }
@@ -306,7 +311,13 @@ namespace GitHub.Runner.Worker
 
                 if (dapDebugger != null)
                 {
-                    await dapDebugger.StopAsync();
+                    try {
+                        await dapDebugger.StopAsync();
+                    }
+                    catch {
+                        Trace.Error("Failed to stop debugger server")
+                        Trace.Error(ex);
+                    }
                 }
 
                 await ShutdownQueue(throwOnFailure: false);