From c83255cf7cd94dfe9da878a56c3e00ba56d2b24a Mon Sep 17 00:00:00 2001
From: "DELL_THAYS\\thays" <thaystg@gmail.com>
Date: Mon, 25 Jul 2022 17:02:22 -0300
Subject: [PATCH 1/7] Removing console.debug message helper to make debugger
 work.

---
 ...buggerProxy.cs => FirefoxDebuggerProxy.cs} |  0
 .../Firefox/FirefoxExecutionContext.cs        |  3 ++-
 .../Firefox/FirefoxMonoProxy.cs               | 21 +++++++++++++++----
 .../debugger/BrowserDebugProxy/MonoProxy.cs   |  7 ++++---
 .../tests/debugger-test/debugger-driver.html  |  2 ++
 .../wasm-page-without-assets.html             |  1 +
 src/mono/wasm/runtime/debug.ts                |  2 --
 7 files changed, 26 insertions(+), 10 deletions(-)
 rename src/mono/wasm/debugger/BrowserDebugProxy/Firefox/{FireforDebuggerProxy.cs => FirefoxDebuggerProxy.cs} (100%)

diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FireforDebuggerProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxDebuggerProxy.cs
similarity index 100%
rename from src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FireforDebuggerProxy.cs
rename to src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxDebuggerProxy.cs
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxExecutionContext.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxExecutionContext.cs
index 253b7316779537..095970f4c799cb 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxExecutionContext.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxExecutionContext.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Threading;
+using System.Threading.Tasks;
 
 #nullable enable
 
@@ -12,7 +13,7 @@ internal sealed class FirefoxExecutionContext : ExecutionContext
     public string? ActorName { get; set; }
     public string? ThreadName { get; set; }
     public string? GlobalName { get; set; }
-    public Result LastDebuggerAgentBufferReceived { get; set; }
+    public Task<Result>? LastDebuggerAgentBufferReceived { get; set; }
 
     public FirefoxExecutionContext(MonoSDBHelper sdbAgent, int id, string actorName) : base(sdbAgent, id, actorName, PauseOnExceptionsKind.Unset)
     {
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
index c34689b5e9e090..2152b8f306b274 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
@@ -262,7 +262,8 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject arg
             return true;
 
         if (args["type"] == null)
-            return await Task.FromResult(false);
+            return false;
+
         switch (args["type"].Value<string>())
         {
             case "paused":
@@ -318,6 +319,16 @@ await Task.WhenAll(
             case "target-available-form":
                 {
                     OnDefaultContextUpdate(sessionId, new FirefoxExecutionContext(new MonoSDBHelper (this, logger, sessionId), 0, args["target"]["consoleActor"].Value<string>()));
+                    var ctx = GetContextFixefox(sessionId);
+                    ctx.GlobalName = args["target"]["actor"].Value<string>();
+                    ctx.ThreadName = args["target"]["threadActor"].Value<string>();
+                    ResetCmdId();
+                    if (await IsRuntimeAlreadyReadyAlready(sessionId, token))
+                    {
+                        await ForwardMessageToIde(args, token);
+                        await RuntimeReady(sessionId, token);
+                        return true;
+                    }
                     break;
                 }
         }
@@ -364,6 +375,8 @@ protected override async Task<bool> AcceptCommand(MessageId sessionId, JObject a
                 {
                     var ctx = GetContextFixefox(sessionId);
                     ctx.ThreadName = args["to"].Value<string>();
+                    if (await IsRuntimeAlreadyReadyAlready(sessionId, token))
+                        await RuntimeReady(sessionId, token);
                     break;
                 }
             case "source":
@@ -698,16 +711,16 @@ protected override async Task<bool> AcceptCommand(MessageId sessionId, JObject a
         return false;
     }
 
-    internal override void SaveLastDebuggerAgentBufferReceivedToContext(SessionId sessionId, Result res)
+    internal override void SaveLastDebuggerAgentBufferReceivedToContext(SessionId sessionId, Task<Result> debuggerAgentBufferTask)
     {
         var context = GetContextFixefox(sessionId);
-        context.LastDebuggerAgentBufferReceived = res;
+        context.LastDebuggerAgentBufferReceived = debuggerAgentBufferTask;
     }
 
     private async Task<bool> SendPauseToBrowser(SessionId sessionId, JObject args, CancellationToken token)
     {
         var context = GetContextFixefox(sessionId);
-        Result res = context.LastDebuggerAgentBufferReceived;
+        Result res = await context.LastDebuggerAgentBufferReceived;
         if (!res.IsOk)
             return false;
 
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
index 82541a4a755136..530c1661f3be26 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
@@ -1040,14 +1040,15 @@ protected virtual async Task<bool> SendCallStack(SessionId sessionId, ExecutionC
             return true;
         }
 
-        internal virtual void SaveLastDebuggerAgentBufferReceivedToContext(SessionId sessionId, Result res)
+        internal virtual void SaveLastDebuggerAgentBufferReceivedToContext(SessionId sessionId, Task<Result> debuggerAgentBufferTask)
         {
         }
 
         internal async Task<bool> OnReceiveDebuggerAgentEvent(SessionId sessionId, JObject args, CancellationToken token)
         {
-            Result res = await SendMonoCommand(sessionId, MonoCommands.GetDebuggerAgentBufferReceived(RuntimeId), token);
-            SaveLastDebuggerAgentBufferReceivedToContext(sessionId, res);
+            var debuggerAgentBufferTask = SendMonoCommand(sessionId, MonoCommands.GetDebuggerAgentBufferReceived(RuntimeId), token);
+            SaveLastDebuggerAgentBufferReceivedToContext(sessionId, debuggerAgentBufferTask);
+            var res = await debuggerAgentBufferTask;
             if (!res.IsOk)
                 return false;
 
diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
index 239039451ccdd7..bfa05daff5599f 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
@@ -17,6 +17,7 @@
 				this.run_all = getDotnetRuntime(0).INTERNAL.mono_bind_static_method ("[debugger-test] DebuggerTest:run_all");
 				this.static_method_table = {};
 				console.log ("ready");
+				console.debug("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
 			},
 		};
 		function invoke_static_method (method_name, ...args) {
@@ -90,6 +91,7 @@
 		function load_wasm_page_without_assets () {
 			console.log("load_wasm_page_without_assets")
 			window.location.replace("http://localhost:9400/wasm-page-without-assets.html");
+			console.debug ("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
 		}
 		</script>
 
diff --git a/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html b/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html
index 992e9bac68a779..08a99681974647 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html
@@ -6,6 +6,7 @@
 	<script type='text/javascript'>
 		var App = {
 			init: function () {
+				console.debug ("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
 				MONO.loaded_files = null;
 			},
 		};
diff --git a/src/mono/wasm/runtime/debug.ts b/src/mono/wasm/runtime/debug.ts
index 5ae913e3c75d88..3f0d5a838d57c4 100644
--- a/src/mono/wasm/runtime/debug.ts
+++ b/src/mono/wasm/runtime/debug.ts
@@ -45,8 +45,6 @@ export function mono_wasm_runtime_ready(): void {
         // eslint-disable-next-line no-debugger
         debugger;
     else
-        console.debug("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
-
     _readSymbolMapFile("dotnet.js.symbols");
 }
 

From a3f853bef2f16f3119e2c9193cdd283feebf7b7f Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Tue, 26 Jul 2022 14:29:46 -0300
Subject: [PATCH 2/7] Update src/mono/wasm/runtime/debug.ts

Co-authored-by: Larry Ewing <lewing@microsoft.com>
---
 src/mono/wasm/runtime/debug.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mono/wasm/runtime/debug.ts b/src/mono/wasm/runtime/debug.ts
index 3f0d5a838d57c4..5a683c99309d4d 100644
--- a/src/mono/wasm/runtime/debug.ts
+++ b/src/mono/wasm/runtime/debug.ts
@@ -44,7 +44,6 @@ export function mono_wasm_runtime_ready(): void {
     if ((<any>globalThis).dotnetDebugger)
         // eslint-disable-next-line no-debugger
         debugger;
-    else
     _readSymbolMapFile("dotnet.js.symbols");
 }
 

From 70d49fb84a8ac3fa79beae04680c59ccfe5ee666 Mon Sep 17 00:00:00 2001
From: "DELL_THAYS\\thays" <thaystg@gmail.com>
Date: Fri, 29 Jul 2022 14:42:15 -0300
Subject: [PATCH 3/7] Addressing @radical comments offline.

---
 .../debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
index 2152b8f306b274..e4d6bf7839885d 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
@@ -714,6 +714,9 @@ protected override async Task<bool> AcceptCommand(MessageId sessionId, JObject a
     internal override void SaveLastDebuggerAgentBufferReceivedToContext(SessionId sessionId, Task<Result> debuggerAgentBufferTask)
     {
         var context = GetContextFixefox(sessionId);
+        if (context.LastDebuggerAgentBufferReceived != null)
+            logger.LogTrace($"Trying to reset debugger agent buffer before use it.");
+
         context.LastDebuggerAgentBufferReceived = debuggerAgentBufferTask;
     }
 
@@ -723,7 +726,7 @@ private async Task<bool> SendPauseToBrowser(SessionId sessionId, JObject args, C
         Result res = await context.LastDebuggerAgentBufferReceived;
         if (!res.IsOk)
             return false;
-
+        context.LastDebuggerAgentBufferReceived = null;
         byte[] newBytes = Convert.FromBase64String(res.Value?["result"]?["value"]?["value"]?.Value<string>());
         using var retDebuggerCmdReader = new MonoBinaryReader(newBytes);
         retDebuggerCmdReader.ReadBytes(11);

From 361fd76cae5b6ac12059720d51e2dc79f74e5b1a Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Wed, 4 Jan 2023 14:27:03 -0300
Subject: [PATCH 4/7] Fixing merge.

---
 src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
index 9f4853c6a22124..54542451768343 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
@@ -7,6 +7,7 @@
 		var App = {
 			static_method_table: {},
 			init: async () => {
+				console.debug ("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
 				const exports = await App.runtime.getAssemblyExports("debugger-test.dll");
 				App.int_add = exports.Math.IntAdd;
 				App.use_complex = exports.Math.UseComplex;

From 52f13dc865a0c928cbcccdf57cd17c1e4aef4524 Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Wed, 4 Jan 2023 16:24:54 -0300
Subject: [PATCH 5/7] Fix line change error.

---
 src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
index 54542451768343..66833e5d1eaa10 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
@@ -45,7 +45,6 @@
 		function invoke_getters_js_test () {
 			getters_js_test ();
 		}
-
 		function invoke_add () {
 			return App.int_add (10, 20);
 		}

From ee1e211041e2f9e37cc6902dbe191142fb8efb8b Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Fri, 6 Jan 2023 14:35:31 -0300
Subject: [PATCH 6/7] Totally removing the message.

---
 .../BrowserDebugProxy/DevToolsHelper.cs       |  2 --
 .../Firefox/FirefoxMonoProxy.cs               | 29 +++++-----------
 .../debugger/BrowserDebugProxy/MonoProxy.cs   | 34 ++++++-------------
 .../FirefoxInspectorClient.cs                 |  2 ++
 .../debugger/DebuggerTestSuite/Inspector.cs   |  2 ++
 .../tests/debugger-test/debugger-driver.html  |  3 +-
 .../wasm-page-without-assets.html             |  2 +-
 7 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
index 5738eb07d2f0d1..4a7f6b9017e461 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
@@ -331,8 +331,6 @@ internal enum MonoErrorCodes
 
     internal static class MonoConstants
     {
-        public const string RUNTIME_IS_READY = "mono_wasm_runtime_ready";
-        public const string RUNTIME_IS_READY_ID = "fe00e07a-5519-4dfe-b35a-f867dbaf2e28";
         public const string EVENT_RAISED = "mono_wasm_debug_event_raised:aef14bca-5519-4dfe-b35a-f867abc123ae";
     }
 
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
index 059dc83c5276a7..4b320d248b7fe9 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
@@ -234,24 +234,6 @@ protected override Task SendEventInternal(SessionId sessionId, string method, JO
 
     protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject args, CancellationToken token)
     {
-        if (args["messages"] != null)
-        {
-            // FIXME: duplicate, and will miss any non-runtime-ready messages being forwarded
-            var messages = args["messages"].Value<JArray>();
-            foreach (var message in messages)
-            {
-                var messageArgs = message["message"]?["arguments"]?.Value<JArray>();
-                if (messageArgs != null && messageArgs.Count == 2)
-                {
-                    if (messageArgs[0].Value<string>() == MonoConstants.RUNTIME_IS_READY && messageArgs[1].Value<string>() == MonoConstants.RUNTIME_IS_READY_ID)
-                    {
-                        ResetCmdId();
-                        await RuntimeReady(sessionId, token);
-                    }
-                }
-            }
-            return true;
-        }
         if (args["frame"] != null && args["type"] == null)
         {
             OnDefaultContextUpdate(sessionId, new FirefoxExecutionContext(new MonoSDBHelper (this, logger, sessionId), 0, args["frame"]["consoleActor"].Value<string>()));
@@ -300,10 +282,10 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject arg
                         }
                         if (message["resourceType"].Value<string>() != "console-message")
                             continue;
-                        var messageArgs = message["message"]?["arguments"]?.Value<JArray>();
+                        //var messageArgs = message["message"]?["arguments"]?.Value<JArray>();
                         var ctx = GetContextFixefox(sessionId);
                         ctx.GlobalName = args["from"].Value<string>();
-                        if (messageArgs != null && messageArgs.Count == 2)
+                        /*if (messageArgs != null && messageArgs.Count == 2)
                         {
                             if (messageArgs[0].Value<string>() == MonoConstants.RUNTIME_IS_READY && messageArgs[1].Value<string>() == MonoConstants.RUNTIME_IS_READY_ID)
                             {
@@ -312,7 +294,7 @@ await Task.WhenAll(
                                     ForwardMessageToIde(args, token),
                                     RuntimeReady(sessionId, token));
                             }
-                        }
+                        }*/
                     }
                     break;
                 }
@@ -704,6 +686,11 @@ protected override async Task<bool> AcceptCommand(MessageId sessionId, JObject a
                     await SendEvent(sessionId, "", ret.Value, token);
                     return true;
                 }
+            case "DotnetDebugger.runTests":
+                {
+                    await RuntimeReady(sessionId, token);
+                    return true;
+                }
             default:
                 return false;
         }
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
index 654fd3b5b9f58e..d0f68b017240a2 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
@@ -20,7 +20,7 @@ internal class MonoProxy : DevToolsProxy
     {
         private IList<string> urlSymbolServerList;
         private HashSet<SessionId> sessions = new HashSet<SessionId>();
-        private static readonly string[] s_executionContextIndependentCDPCommandNames = { "DotnetDebugger.setDebuggerProperty" };
+        private static readonly string[] s_executionContextIndependentCDPCommandNames = { "DotnetDebugger.setDebuggerProperty", "DotnetDebugger.runTests" };
         protected Dictionary<SessionId, ExecutionContext> contexts = new Dictionary<SessionId, ExecutionContext>();
 
         public static HttpClient HttpClient => new HttpClient();
@@ -94,7 +94,7 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject par
                 case "Runtime.consoleAPICalled":
                     {
                         // Don't process events from sessions we aren't tracking
-                        if (!contexts.TryGetValue(sessionId, out ExecutionContext context))
+                        if (!contexts.ContainsKey(sessionId))
                             return false;
                         string type = args["type"]?.ToString();
                         if (type == "debug")
@@ -104,28 +104,7 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject par
                                 break;
 
                             int aCount = a.Count();
-                            if (aCount >= 2 &&
-                                a[0]?["value"]?.ToString() == MonoConstants.RUNTIME_IS_READY &&
-                                a[1]?["value"]?.ToString() == MonoConstants.RUNTIME_IS_READY_ID)
-                            {
-                                if (aCount > 2)
-                                {
-                                    try
-                                    {
-                                        // The optional 3rd argument is the stringified assembly
-                                        // list so that we don't have to make more round trips
-                                        string loaded = a[2]?["value"]?.ToString();
-                                        if (loaded != null)
-                                            context.LoadedFiles = JToken.Parse(loaded).ToObject<string[]>();
-                                    }
-                                    catch (InvalidCastException ice)
-                                    {
-                                        Log("verbose", ice.ToString());
-                                    }
-                                }
-                                await RuntimeReady(sessionId, token);
-                            }
-                            else if (aCount > 1 && a[0]?["value"]?.ToString() == MonoConstants.EVENT_RAISED)
+                            if (aCount > 1 && a[0]?["value"]?.ToString() == MonoConstants.EVENT_RAISED)
                             {
                                 if (a.Type != JTokenType.Array)
                                 {
@@ -587,6 +566,13 @@ protected override async Task<bool> AcceptCommand(MessageId id, JObject parms, C
                         }
                         return true;
                     }
+                case "DotnetDebugger.runTests":
+                    {
+                        SendResponse(id, Result.OkFromObject(new { }), token);
+                        if (await IsRuntimeAlreadyReadyAlready(id, token))
+                            await RuntimeReady(id, token);
+                        return true;
+                    }
             }
             // for Dotnetdebugger.* messages, treat them as handled, thus not passing them on to the browser
             return method.StartsWith("DotnetDebugger.", StringComparison.OrdinalIgnoreCase);
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/FirefoxInspectorClient.cs b/src/mono/wasm/debugger/DebuggerTestSuite/FirefoxInspectorClient.cs
index f536e066fa3b2e..d0eff4c5e2c12a 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/FirefoxInspectorClient.cs
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/FirefoxInspectorClient.cs
@@ -84,6 +84,8 @@ public async Task<bool> ProcessTabInfo(Result command, CancellationToken token)
         res = await SendCommand("watchResources", JObject.FromObject(new { type = "watchResources", resourceTypes = new JArray("console-message"), to = watcherId}), token);
         res = await SendCommand("watchTargets", JObject.FromObject(new { type = "watchTargets", targetType = "frame", to = watcherId}), token);
         UpdateTarget(res.Value?["result"]?["value"]?["target"] as JObject);
+        if (ThreadActorId == null)
+            return false;
         res = await SendCommand("attach", JObject.FromObject(new
             {
                 type = "attach",
diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs
index d045d652885b13..62462481685a6a 100644
--- a/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs
+++ b/src/mono/wasm/debugger/DebuggerTestSuite/Inspector.cs
@@ -224,6 +224,8 @@ async Task OnMessage(string method, JObject args, CancellationToken token)
                         case "trace": _logger.LogTrace(line); break;
                         default: _logger.LogInformation(line); break;
                     }
+                    if (line == "console.debug: #debugger-app-ready#")
+                        await Client.SendCommand("DotnetDebugger.runTests", JObject.FromObject(new { type = "DotnetDebugger.runTests", to = "root" }), token);
 
                     if (!_gotAppReady && line == "console.debug: #debugger-app-ready#")
                     {
diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
index 66833e5d1eaa10..3bdd429f7ab7da 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html
@@ -7,7 +7,6 @@
 		var App = {
 			static_method_table: {},
 			init: async () => {
-				console.debug ("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
 				const exports = await App.runtime.getAssemblyExports("debugger-test.dll");
 				App.int_add = exports.Math.IntAdd;
 				App.use_complex = exports.Math.UseComplex;
@@ -91,7 +90,7 @@
 		function load_wasm_page_without_assets () {
 			console.log("load_wasm_page_without_assets")
 			window.location.replace("http://localhost:9400/wasm-page-without-assets.html");
-			console.debug ("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
+			console.debug ("#debugger-app-ready#");
 		}
 		function load_non_wasm_page_forcing_runtime_ready () {
 			console.log("load_non_wasm_page_forcing_runtime_ready")
diff --git a/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html b/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html
index c208a1dcd5b85f..49a836c8e88598 100644
--- a/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html
+++ b/src/mono/wasm/debugger/tests/debugger-test/wasm-page-without-assets.html
@@ -8,7 +8,7 @@
 	<script type='text/javascript'>
 		var App = {
 			init: function () {
-				console.debug ("mono_wasm_runtime_ready", "fe00e07a-5519-4dfe-b35a-f867dbaf2e28");
+				console.debug ("#debugger-app-ready#");
 			},
 		};
 		function reload_wasm_page () {

From 50cfc85223dff19a9891e75fdccc4576fd89272d Mon Sep 17 00:00:00 2001
From: Thays Grazia <thaystg@gmail.com>
Date: Mon, 9 Jan 2023 11:44:06 -0300
Subject: [PATCH 7/7] Remove unused comment

---
 .../BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs     | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
index 4b320d248b7fe9..3d811d85f0d6e7 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
@@ -282,19 +282,8 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject arg
                         }
                         if (message["resourceType"].Value<string>() != "console-message")
                             continue;
-                        //var messageArgs = message["message"]?["arguments"]?.Value<JArray>();
                         var ctx = GetContextFixefox(sessionId);
                         ctx.GlobalName = args["from"].Value<string>();
-                        /*if (messageArgs != null && messageArgs.Count == 2)
-                        {
-                            if (messageArgs[0].Value<string>() == MonoConstants.RUNTIME_IS_READY && messageArgs[1].Value<string>() == MonoConstants.RUNTIME_IS_READY_ID)
-                            {
-                                ResetCmdId();
-                                await Task.WhenAll(
-                                    ForwardMessageToIde(args, token),
-                                    RuntimeReady(sessionId, token));
-                            }
-                        }*/
                     }
                     break;
                 }