4 files changed, 11 insertions, 4 deletions
diff --git a/src/inspector/node_protocol.pdl b/src/inspector/node_protocol.pdl
index 36d528b937..608521b467 100644
--- a/src/inspector/node_protocol.pdl
+++ b/src/inspector/node_protocol.pdl
@@ -71,6 +71,11 @@ experimental domain NodeWorker
   # Detaches from all running workers and disables attaching to new workers as they are started.
   command disable
 
+  # Detached from the worker with given sessionId.
+  command detach
+    parameters
+      SessionID sessionId
+
   # Issued when attached to a worker.
   event attachedToWorker
     parameters
diff --git a/src/inspector/runtime_agent.cc b/src/inspector/runtime_agent.cc
index f8fdbe42d4..4056140e70 100644
--- a/src/inspector/runtime_agent.cc
+++ b/src/inspector/runtime_agent.cc
@@ -16,10 +16,6 @@ void RuntimeAgent::Wire(UberDispatcher* dispatcher) {
 }
 
 DispatchResponse RuntimeAgent::notifyWhenWaitingForDisconnect(bool enabled) {
-  if (!env_->owns_process_state()) {
-    return DispatchResponse::Error(
-        "NodeRuntime domain can only be used through main thread sessions");
-  }
   notify_when_waiting_for_disconnect_ = enabled;
   return DispatchResponse::OK();
 }
diff --git a/src/inspector/worker_agent.cc b/src/inspector/worker_agent.cc
index d343de8494..81706572e6 100644
--- a/src/inspector/worker_agent.cc
+++ b/src/inspector/worker_agent.cc
@@ -115,6 +115,11 @@ DispatchResponse WorkerAgent::disable() {
   return DispatchResponse::OK();
 }
 
+DispatchResponse WorkerAgent::detach(const String& sessionId) {
+  workers_->Detached(sessionId);
+  return DispatchResponse::OK();
+}
+
 void NodeWorkers::WorkerCreated(const std::string& title,
                                 const std::string& url,
                                 bool waiting,
diff --git a/src/inspector/worker_agent.h b/src/inspector/worker_agent.h
index 402c719416..1bd25189bf 100644
--- a/src/inspector/worker_agent.h
+++ b/src/inspector/worker_agent.h
@@ -25,6 +25,7 @@ class WorkerAgent : public NodeWorker::Backend {
 
   DispatchResponse enable(bool waitForDebuggerOnStart) override;
   DispatchResponse disable() override;
+  DispatchResponse detach(const String& sessionId) override;
 
  private:
   std::shared_ptr<NodeWorker::Frontend> frontend_;