diff --git a/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift b/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
index fa636b718..ca5e85edf 100644
--- a/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
+++ b/apps/macos/Sources/Clawdbot/ExecApprovalsSocket.swift
@@ -28,7 +28,7 @@ private struct ExecApprovalSocketDecision: Codable {
     var decision: ExecApprovalDecision
 }
 
-private struct ExecHostSocketRequest: Codable {
+fileprivate struct ExecHostSocketRequest: Codable {
     var type: String
     var id: String
     var nonce: String
@@ -37,7 +37,7 @@ private struct ExecHostSocketRequest: Codable {
     var requestJson: String
 }
 
-private struct ExecHostRequest: Codable {
+fileprivate struct ExecHostRequest: Codable {
     var command: [String]
     var rawCommand: String?
     var cwd: String?
@@ -48,7 +48,7 @@ private struct ExecHostRequest: Codable {
     var sessionKey: String?
 }
 
-private struct ExecHostRunResult: Codable {
+fileprivate struct ExecHostRunResult: Codable {
     var exitCode: Int?
     var timedOut: Bool
     var success: Bool
@@ -57,13 +57,13 @@ private struct ExecHostRunResult: Codable {
     var error: String?
 }
 
-private struct ExecHostError: Codable {
+fileprivate struct ExecHostError: Codable {
     var code: String
     var message: String
     var reason: String?
 }
 
-private struct ExecHostResponse: Codable {
+fileprivate struct ExecHostResponse: Codable {
     var type: String
     var id: String
     var ok: Bool
@@ -254,7 +254,7 @@ enum ExecApprovalsPromptPresenter {
 }
 
 @MainActor
-enum ExecHostExecutor {
+fileprivate enum ExecHostExecutor {
     private static let blockedEnvKeys: Set<String> = [
         "PATH",
         "NODE_OPTIONS",
diff --git a/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift b/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
index c1617d17e..e362a62c5 100644
--- a/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
+++ b/apps/macos/Sources/Clawdbot/MenuSessionsInjector.swift
@@ -440,6 +440,8 @@ extension MenuSessionsInjector {
             displayName: "Gateway",
             platform: platform,
             version: nil,
+            coreVersion: nil,
+            uiVersion: nil,
             deviceFamily: nil,
             modelIdentifier: nil,
             remoteIp: host,