react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp

@@ -7,7 +7,7 @@
 
 #include "jsireact/JSINativeModules.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
 
@@ -111,4 +111,4 @@ std::optional<Object> JSINativeModules::createModule(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <memory>
 #include <string>
@@ -21,11 +21,10 @@ namespace facebook::react {
 /**
  * Holds and creates JS representations of the modules in ModuleRegistry
  */
-class [[deprecated(
-    "This API will be removed along with the legacy architecture.")]] JSINativeModules {
+class [[deprecated("This API will be removed along with the legacy architecture.")]] JSINativeModules {
  public:
   explicit JSINativeModules(std::shared_ptr<ModuleRegistry> moduleRegistry);
-  jsi::Value getModule(jsi::Runtime& rt, const jsi::PropNameID& name);
+  jsi::Value getModule(jsi::Runtime &rt, const jsi::PropNameID &name);
   void reset();
 
  private:
@@ -33,11 +32,9 @@ class [[deprecated(
   std::shared_ptr<ModuleRegistry> m_moduleRegistry;
   std::unordered_map<std::string, jsi::Object> m_objects;
 
-  std::optional<jsi::Object> createModule(
-      jsi::Runtime& rt,
-      const std::string& name);
+  std::optional<jsi::Object> createModule(jsi::Runtime &rt, const std::string &name);
 };
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH

package/ReactCommon/jsinspector-modern/Base64.h

@@ -15,19 +15,17 @@ namespace facebook::react::jsinspector_modern {
 namespace {
 // Vendored from Folly
 // https://github.com/facebook/folly/blob/v2024.07.08.00/folly/detail/base64_detail/Base64Scalar.h
-constexpr char kBase64Charset[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+constexpr char kBase64Charset[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-constexpr char kBase64URLCharset[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+constexpr char kBase64URLCharset[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
 
 template <bool isURL>
 struct Base64ScalarImpl {
-  static constexpr const char* kCharset =
-      isURL ? kBase64URLCharset : kBase64Charset;
+  static constexpr const char *kCharset = isURL ? kBase64URLCharset : kBase64Charset;
 
   // 0, 1 or 2 bytes
-  static constexpr char* encodeTail(const char* f, const char* l, char* o) {
+  static constexpr char *encodeTail(const char *f, const char *l, char *o)
+  {
     if (f == l) {
       return o;
     }
@@ -59,7 +57,8 @@ struct Base64ScalarImpl {
     return o;
   }
 
-  static constexpr char* encode(const char* f, const char* l, char* o) {
+  static constexpr char *encode(const char *f, const char *l, char *o)
+  {
     while ((l - f) >= 3) {
       std::uint8_t aaab = f[0];
       std::uint8_t bbcc = f[1];
@@ -84,12 +83,14 @@ struct Base64ScalarImpl {
 };
 
 // https://github.com/facebook/folly/blob/v2024.07.08.00/folly/detail/base64_detail/Base64Common.h#L24
-constexpr std::size_t base64EncodedSize(std::size_t inSize) {
+constexpr std::size_t base64EncodedSize(std::size_t inSize)
+{
   return ((inSize + 2) / 3) * 4;
 }
 } // namespace
 
-inline std::string base64Encode(const std::string_view s) {
+inline std::string base64Encode(const std::string_view s)
+{
   std::string res(base64EncodedSize(s.size()), '\0');
   Base64ScalarImpl<false>::encode(s.data(), s.data() + s.size(), res.data());
   return res;

package/ReactCommon/jsinspector-modern/CMakeLists.txt

@@ -26,6 +26,7 @@ target_link_libraries(jsinspector
         react_featureflags
         runtimeexecutor
         reactperflogger
+        react_utils
 )
 target_compile_reactnative_options(jsinspector PRIVATE)
 if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)

package/ReactCommon/jsinspector-modern/ConsoleMessage.h

@@ -43,18 +43,14 @@ struct SimpleConsoleMessage {
   ConsoleAPIType type;
   std::vector<std::string> args;
 
-  SimpleConsoleMessage(
-      double timestamp,
-      ConsoleAPIType type,
-      std::vector<std::string> args);
+  SimpleConsoleMessage(double timestamp, ConsoleAPIType type, std::vector<std::string> args);
 
   SimpleConsoleMessage(ConsoleAPIType type, std::vector<std::string> args);
 
-  SimpleConsoleMessage(const SimpleConsoleMessage& other) = delete;
-  SimpleConsoleMessage(SimpleConsoleMessage&& other) noexcept = default;
-  SimpleConsoleMessage& operator=(const SimpleConsoleMessage& other) = delete;
-  SimpleConsoleMessage& operator=(SimpleConsoleMessage&& other) noexcept =
-      default;
+  SimpleConsoleMessage(const SimpleConsoleMessage &other) = delete;
+  SimpleConsoleMessage(SimpleConsoleMessage &&other) noexcept = default;
+  SimpleConsoleMessage &operator=(const SimpleConsoleMessage &other) = delete;
+  SimpleConsoleMessage &operator=(SimpleConsoleMessage &&other) noexcept = default;
   ~SimpleConsoleMessage() = default;
 };
 
@@ -72,17 +68,16 @@ struct ConsoleMessage {
       ConsoleAPIType type,
       std::vector<jsi::Value> args,
       std::unique_ptr<StackTrace> stackTrace = StackTrace::empty())
-      : timestamp(timestamp),
-        type(type),
-        args(std::move(args)),
-        stackTrace(std::move(stackTrace)) {}
+      : timestamp(timestamp), type(type), args(std::move(args)), stackTrace(std::move(stackTrace))
+  {
+  }
 
-  ConsoleMessage(jsi::Runtime& runtime, SimpleConsoleMessage message);
+  ConsoleMessage(jsi::Runtime &runtime, SimpleConsoleMessage message);
 
-  ConsoleMessage(const ConsoleMessage& other) = delete;
-  ConsoleMessage(ConsoleMessage&& other) noexcept = default;
-  ConsoleMessage& operator=(const ConsoleMessage& other) = delete;
-  ConsoleMessage& operator=(ConsoleMessage&& other) noexcept = default;
+  ConsoleMessage(const ConsoleMessage &other) = delete;
+  ConsoleMessage(ConsoleMessage &&other) noexcept = default;
+  ConsoleMessage &operator=(const ConsoleMessage &other) = delete;
+  ConsoleMessage &operator=(ConsoleMessage &&other) noexcept = default;
   ~ConsoleMessage() = default;
 };
 

package/ReactCommon/jsinspector-modern/EnumArray.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <array>
+#include <limits>
+
+namespace facebook::react::jsinspector_modern {
+
+/**
+ * A statically-sized array with an enum class as the index type.
+ * Values are value-initialized (i.e. zero-initialized for integral types).
+ * Requires that the enum class has a kMaxValue member.
+ */
+template <class IndexType, class ValueType>
+  requires std::is_enum_v<IndexType> && std::is_same_v<std::underlying_type_t<IndexType>, int> &&
+    requires { IndexType::kMaxValue; } && (static_cast<int>(IndexType::kMaxValue) < std::numeric_limits<int>::max())
+
+class EnumArray {
+ public:
+  constexpr ValueType &operator[](IndexType i)
+  {
+    return array_[static_cast<int>(i)];
+  }
+
+  constexpr const ValueType &operator[](IndexType i) const
+  {
+    return array_[static_cast<int>(i)];
+  }
+
+  constexpr int size() const
+  {
+    return size_;
+  }
+
+ private:
+  constexpr static int size_ = static_cast<int>(IndexType::kMaxValue) + 1;
+
+  std::array<ValueType, size_> array_{};
+};
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ExecutionContext.h

@@ -31,7 +31,7 @@ class ExecutionContextSelector {
   /**
    * Returns true iff this selector matches \c context.
    */
-  bool matches(const ExecutionContextDescription& context) const noexcept;
+  bool matches(const ExecutionContextDescription &context) const noexcept;
 
   /**
    * Returns a new selector that matches only the given execution context ID.
@@ -49,15 +49,14 @@ class ExecutionContextSelector {
   static ExecutionContextSelector all();
 
   ExecutionContextSelector() = delete;
-  ExecutionContextSelector(const ExecutionContextSelector& other) = default;
-  ExecutionContextSelector(ExecutionContextSelector&& other) noexcept = default;
-  ExecutionContextSelector& operator=(const ExecutionContextSelector& other) =
-      default;
-  ExecutionContextSelector& operator=(
-      ExecutionContextSelector&& other) noexcept = default;
+  ExecutionContextSelector(const ExecutionContextSelector &other) = default;
+  ExecutionContextSelector(ExecutionContextSelector &&other) noexcept = default;
+  ExecutionContextSelector &operator=(const ExecutionContextSelector &other) = default;
+  ExecutionContextSelector &operator=(ExecutionContextSelector &&other) noexcept = default;
   ~ExecutionContextSelector() = default;
 
-  inline bool operator==(const ExecutionContextSelector& other) const noexcept {
+  inline bool operator==(const ExecutionContextSelector &other) const noexcept
+  {
     return value_ == other.value_;
   }
 
@@ -75,20 +74,16 @@ class ExecutionContextSelector {
 
   using Representation = std::variant<AllContexts, ContextId, ContextName>;
 
-  explicit inline ExecutionContextSelector(Representation&& r) : value_(r) {}
+  explicit inline ExecutionContextSelector(Representation &&r) : value_(r) {}
 
   Representation value_;
 
-  friend struct std::hash<
-      facebook::react::jsinspector_modern::ExecutionContextSelector>;
+  friend struct std::hash<facebook::react::jsinspector_modern::ExecutionContextSelector>;
 };
 
-using ExecutionContextSelectorSet =
-    std::unordered_set<ExecutionContextSelector>;
+using ExecutionContextSelectorSet = std::unordered_set<ExecutionContextSelector>;
 
-bool matchesAny(
-    const ExecutionContextDescription& context,
-    const ExecutionContextSelectorSet& selectors);
+bool matchesAny(const ExecutionContextDescription &context, const ExecutionContextSelectorSet &selectors);
 
 } // namespace facebook::react::jsinspector_modern
 
@@ -96,12 +91,9 @@ namespace std {
 
 template <>
 struct hash<::facebook::react::jsinspector_modern::ExecutionContextSelector> {
-  size_t operator()(
-      const ::facebook::react::jsinspector_modern::ExecutionContextSelector&
-          selector) const {
-    return hash<::facebook::react::jsinspector_modern::
-                    ExecutionContextSelector::Representation>{}(
-        selector.value_);
+  size_t operator()(const ::facebook::react::jsinspector_modern::ExecutionContextSelector &selector) const
+  {
+    return hash<::facebook::react::jsinspector_modern::ExecutionContextSelector::Representation>{}(selector.value_);
   }
 };
 

package/ReactCommon/jsinspector-modern/FallbackRuntimeAgentDelegate.cpp

@@ -56,16 +56,17 @@ void FallbackRuntimeAgentDelegate::sendFallbackRuntimeWarning() {
 }
 
 void FallbackRuntimeAgentDelegate::sendWarningLogEntry(std::string_view text) {
-  frontendChannel_(cdp::jsonNotification(
-      "Log.entryAdded",
-      folly::dynamic::object(
-          "entry",
+  frontendChannel_(
+      cdp::jsonNotification(
+          "Log.entryAdded",
           folly::dynamic::object(
-              "timestamp",
-              duration_cast<milliseconds>(
-                  system_clock::now().time_since_epoch())
-                  .count())("source", "other")("level", "warning")(
-              "text", text))));
+              "entry",
+              folly::dynamic::object(
+                  "timestamp",
+                  duration_cast<milliseconds>(
+                      system_clock::now().time_since_epoch())
+                      .count())("source", "other")("level", "warning")(
+                  "text", text))));
 }
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/FallbackRuntimeAgentDelegate.h

@@ -29,7 +29,7 @@ class FallbackRuntimeAgentDelegate : public RuntimeAgentDelegate {
    */
   FallbackRuntimeAgentDelegate(
       FrontendChannel frontendChannel,
-      const SessionState& sessionState,
+      const SessionState &sessionState,
       std::string engineDescription);
 
   /**
@@ -40,7 +40,7 @@ class FallbackRuntimeAgentDelegate : public RuntimeAgentDelegate {
    * to the request (with either a success or error message). False if the
    * agent expects another agent to respond to the request instead.
    */
-  bool handleRequest(const cdp::PreparsedRequest& req) override;
+  bool handleRequest(const cdp::PreparsedRequest &req) override;
 
  private:
   /**

package/ReactCommon/jsinspector-modern/FallbackRuntimeTargetDelegate.cpp

@@ -58,4 +58,10 @@ FallbackRuntimeTargetDelegate::collectSamplingProfile() {
       "Sampling Profiler capabilities are not supported for Runtime fallback");
 }
 
+std::optional<folly::dynamic>
+FallbackRuntimeTargetDelegate::serializeStackTrace(
+    const StackTrace& /*stackTrace*/) {
+  return std::nullopt;
+}
+
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/FallbackRuntimeTargetDelegate.h

@@ -25,20 +25,16 @@ class FallbackRuntimeTargetDelegate : public RuntimeTargetDelegate {
 
   std::unique_ptr<RuntimeAgentDelegate> createAgentDelegate(
       FrontendChannel channel,
-      SessionState& sessionState,
-      std::unique_ptr<RuntimeAgentDelegate::ExportedState>
-          previouslyExportedState,
-      const ExecutionContextDescription& executionContextDescription,
+      SessionState &sessionState,
+      std::unique_ptr<RuntimeAgentDelegate::ExportedState> previouslyExportedState,
+      const ExecutionContextDescription &executionContextDescription,
       RuntimeExecutor runtimeExecutor) override;
 
-  void addConsoleMessage(jsi::Runtime& runtime, ConsoleMessage message)
-      override;
+  void addConsoleMessage(jsi::Runtime &runtime, ConsoleMessage message) override;
 
   bool supportsConsole() const override;
 
-  std::unique_ptr<StackTrace> captureStackTrace(
-      jsi::Runtime& runtime,
-      size_t framesToSkip) override;
+  std::unique_ptr<StackTrace> captureStackTrace(jsi::Runtime &runtime, size_t framesToSkip) override;
 
   void enableSamplingProfiler() override;
 
@@ -46,6 +42,8 @@ class FallbackRuntimeTargetDelegate : public RuntimeTargetDelegate {
 
   tracing::RuntimeSamplingProfile collectSamplingProfile() override;
 
+  std::optional<folly::dynamic> serializeStackTrace(const StackTrace &stackTrace) override;
+
  private:
   std::string engineDescription_;
 };

package/ReactCommon/jsinspector-modern/HostAgent.cpp

@@ -9,6 +9,8 @@
 #include "InstanceAgent.h"
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
+#include "InspectorFlags.h"
+#include "InspectorInterfaces.h"
 #include "NetworkIOAgent.h"
 #include "SessionState.h"
 #include "TracingAgent.h"
@@ -41,18 +43,14 @@ class HostAgent::Impl final {
       HostTargetController& targetController,
       HostTargetMetadata hostMetadata,
       SessionState& sessionState,
-      VoidExecutor executor,
-      std::optional<tracing::TraceRecordingState> traceRecordingToEmit)
+      VoidExecutor executor)
       : frontendChannel_(frontendChannel),
         targetController_(targetController),
         hostMetadata_(std::move(hostMetadata)),
         sessionState_(sessionState),
         networkIOAgent_(NetworkIOAgent(frontendChannel, std::move(executor))),
-        tracingAgent_(TracingAgent(
-            frontendChannel,
-            sessionState,
-            targetController,
-            std::move(traceRecordingToEmit))) {}
+        tracingAgent_(
+            TracingAgent(frontendChannel, sessionState, targetController)) {}
 
   ~Impl() {
     if (isPausedInDebuggerOverlayVisible_) {
@@ -146,6 +144,37 @@ class HostAgent::Impl final {
           .shouldSendOKResponse = true,
       };
     }
+    if (InspectorFlags::getInstance().getNetworkInspectionEnabled()) {
+      if (req.method == "Network.enable") {
+        auto& inspector = getInspectorInstance();
+        if (inspector.getSystemState().registeredHostsCount > 1) {
+          frontendChannel_(
+              cdp::jsonError(
+                  req.id,
+                  cdp::ErrorCode::InternalError,
+                  "The Network domain is unavailable when multiple React Native hosts are registered."));
+          return {
+              .isFinishedHandlingRequest = true,
+              .shouldSendOKResponse = false,
+          };
+        }
+
+        sessionState_.isNetworkDomainEnabled = true;
+
+        return {
+            .isFinishedHandlingRequest = false,
+            .shouldSendOKResponse = true,
+        };
+      }
+      if (req.method == "Network.disable") {
+        sessionState_.isNetworkDomainEnabled = false;
+
+        return {
+            .isFinishedHandlingRequest = false,
+            .shouldSendOKResponse = true,
+        };
+      }
+    }
 
     // Methods other than domain enables/disables: handle anything we know how
     // to handle, and delegate to the InstanceAgent otherwise. (In some special
@@ -197,9 +226,23 @@ class HostAgent::Impl final {
         sendFuseboxNotice();
       }
 
-      frontendChannel_(cdp::jsonNotification(
-          "ReactNativeApplication.metadataUpdated",
-          createHostMetadataPayload(hostMetadata_)));
+      frontendChannel_(
+          cdp::jsonNotification(
+              "ReactNativeApplication.metadataUpdated",
+              createHostMetadataPayload(hostMetadata_)));
+      auto& inspector = getInspectorInstance();
+      bool isSingleHost = inspector.getSystemState().registeredHostsCount <= 1;
+      if (!isSingleHost) {
+        emitSystemStateChanged(isSingleHost);
+      }
+
+      auto stashedTraceRecording =
+          targetController_.getDelegate()
+              .unstable_getTraceRecordingThatWillBeEmittedOnInitialization();
+      if (stashedTraceRecording.has_value()) {
+        tracingAgent_.emitExternalTraceRecording(
+            std::move(stashedTraceRecording.value()));
+      }
 
       return {
           .isFinishedHandlingRequest = true,
@@ -228,10 +271,11 @@ class HostAgent::Impl final {
         auto executionContextId = req.params["executionContextId"].getInt();
         if (executionContextId < (int64_t)std::numeric_limits<int32_t>::min() ||
             executionContextId > (int64_t)std::numeric_limits<int32_t>::max()) {
-          frontendChannel_(cdp::jsonError(
-              req.id,
-              cdp::ErrorCode::InvalidParams,
-              "Invalid execution context id"));
+          frontendChannel_(
+              cdp::jsonError(
+                  req.id,
+                  cdp::ErrorCode::InvalidParams,
+                  "Invalid execution context id"));
           return {
               .isFinishedHandlingRequest = true,
               .shouldSendOKResponse = false,
@@ -241,10 +285,11 @@ class HostAgent::Impl final {
             ExecutionContextSelector::byId((int32_t)executionContextId);
 
         if (req.params.count("executionContextName") != 0u) {
-          frontendChannel_(cdp::jsonError(
-              req.id,
-              cdp::ErrorCode::InvalidParams,
-              "executionContextName is mutually exclusive with executionContextId"));
+          frontendChannel_(
+              cdp::jsonError(
+                  req.id,
+                  cdp::ErrorCode::InvalidParams,
+                  "executionContextName is mutually exclusive with executionContextId"));
           return {
               .isFinishedHandlingRequest = true,
               .shouldSendOKResponse = false,
@@ -336,12 +381,33 @@ class HostAgent::Impl final {
     }
   }
 
+  bool hasFuseboxClientConnected() const {
+    return fuseboxClientType_ == FuseboxClientType::Fusebox;
+  }
+
+  void emitExternalTraceRecording(
+      tracing::TraceRecordingState traceRecording) const {
+    assert(
+        hasFuseboxClientConnected() &&
+        "Attempted to emit a trace recording to a non-Fusebox client");
+    tracingAgent_.emitExternalTraceRecording(std::move(traceRecording));
+  }
+
+  void emitSystemStateChanged(bool isSingleHost) {
+    frontendChannel_(
+        cdp::jsonNotification(
+            "ReactNativeApplication.systemStateChanged",
+            folly::dynamic::object("isSingleHost", isSingleHost)));
+
+    frontendChannel_(cdp::jsonNotification("Network.disable"));
+  }
+
  private:
   enum class FuseboxClientType { Unknown, Fusebox, NonFusebox };
 
   /**
    * Send a simple Log.entryAdded notification with the given
-   * \param text. You must ensure that the frontend has enabled Log
+   * \param text You must ensure that the frontend has enabled Log
    * notifications (using Log.enable) prior to calling this function. In Chrome
    * DevTools, the message will appear in the Console tab along with regular
    * console messages. The difference between Log.entryAdded and
@@ -355,16 +421,17 @@ class HostAgent::Impl final {
     for (auto arg : args) {
       argsArray.push_back(arg);
     }
-    frontendChannel_(cdp::jsonNotification(
-        "Log.entryAdded",
-        folly::dynamic::object(
-            "entry",
+    frontendChannel_(
+        cdp::jsonNotification(
+            "Log.entryAdded",
             folly::dynamic::object(
-                "timestamp",
-                duration_cast<milliseconds>(
-                    system_clock::now().time_since_epoch())
-                    .count())("source", "other")("level", "info")("text", text)(
-                "args", std::move(argsArray)))));
+                "entry",
+                folly::dynamic::object(
+                    "timestamp",
+                    duration_cast<milliseconds>(
+                        system_clock::now().time_since_epoch())
+                        .count())("source", "other")("level", "info")(
+                    "text", text)("args", std::move(argsArray)))));
   }
 
   void sendFuseboxNotice() {
@@ -432,11 +499,16 @@ class HostAgent::Impl final {
       HostTargetController& targetController,
       HostTargetMetadata hostMetadata,
       SessionState& sessionState,
-      VoidExecutor executor,
-      std::optional<tracing::TraceRecordingState> traceRecordingToEmit) {}
+      VoidExecutor executor) {}
 
   void handleRequest(const cdp::PreparsedRequest& req) {}
   void setCurrentInstanceAgent(std::shared_ptr<InstanceAgent> agent) {}
+  bool hasFuseboxClientConnected() const {
+    return false;
+  }
+  void emitExternalTraceRecording(tracing::TraceRecordingState traceRecording) {
+  }
+  void emitSystemStateChanged(bool isSingleHost) {}
 };
 
 #endif // REACT_NATIVE_DEBUGGER_ENABLED
@@ -446,16 +518,15 @@ HostAgent::HostAgent(
     HostTargetController& targetController,
     HostTargetMetadata hostMetadata,
     SessionState& sessionState,
-    VoidExecutor executor,
-    std::optional<tracing::TraceRecordingState> traceRecordingToEmit)
-    : impl_(std::make_unique<Impl>(
-          *this,
-          frontendChannel,
-          targetController,
-          std::move(hostMetadata),
-          sessionState,
-          std::move(executor),
-          std::move(traceRecordingToEmit))) {}
+    VoidExecutor executor)
+    : impl_(
+          std::make_unique<Impl>(
+              *this,
+              frontendChannel,
+              targetController,
+              std::move(hostMetadata),
+              sessionState,
+              std::move(executor))) {}
 
 HostAgent::~HostAgent() = default;
 
@@ -468,6 +539,19 @@ void HostAgent::setCurrentInstanceAgent(
   impl_->setCurrentInstanceAgent(std::move(instanceAgent));
 }
 
+bool HostAgent::hasFuseboxClientConnected() const {
+  return impl_->hasFuseboxClientConnected();
+}
+
+void HostAgent::emitExternalTraceRecording(
+    tracing::TraceRecordingState traceRecording) const {
+  impl_->emitExternalTraceRecording(std::move(traceRecording));
+}
+
+void HostAgent::emitSystemStateChanged(bool isSingleHost) const {
+  impl_->emitSystemStateChanged(isSingleHost);
+}
+
 #pragma mark - Tracing
 
 HostTracingAgent::HostTracingAgent(tracing::TraceRecordingState& state)