Remove Features, expose _room

Author: pblazej

VoiceAgent/Agent/AgentSession+Types.swift

@@ -18,23 +18,11 @@ extension AgentSession {
 //        }
     }
 
-    struct Features: OptionSet {
-        let rawValue: Int
-
-        static let voice = Self(rawValue: 1 << 0)
-        static let text = Self(rawValue: 1 << 1)
-        static let video = Self(rawValue: 1 << 2)
-
-        static let all: Self = [.voice, .text, .video]
-    }
-
-    struct Context {
+    struct Options {
         let room: Room
-        let features: Features
 
-        init(room: Room = .init(), features: Features = .all) {
+        init(room: Room = .init()) {
             self.room = room
-            self.features = features
         }
     }
 

VoiceAgent/Agent/AgentSession.swift

@@ -39,13 +39,12 @@ final class AgentSession: ObservableObject {
 
     @Published private(set) var messages: OrderedDictionary<ReceivedMessage.ID, ReceivedMessage> = [:]
 
-    var supportedFeatures: Features { features }
+    var _room: Room { room }
 
     // MARK: - Dependencies
 
     private let environment: Environment
     private let room: Room
-    private let features: Features
     private let senders: [any MessageSender]
     private let receivers: [any MessageReceiver]
 
@@ -55,10 +54,9 @@ final class AgentSession: ObservableObject {
 
     // MARK: - Init
 
-    init(environment: Environment, context: Context = .init(), senders: [any MessageSender]? = nil, receivers: [any MessageReceiver]? = nil) {
+    init(environment: Environment, options: Options = .init(), senders: [any MessageSender]? = nil, receivers: [any MessageReceiver]? = nil) {
         self.environment = environment
-        room = context.room
-        features = context.features
+        room = options.room
 
         let textMessageSender = TextMessageSender(room: room)
         self.senders = senders ?? [textMessageSender]

VoiceAgent/ControlBar/ControlBar.swift

@@ -16,17 +16,17 @@ struct ControlBar: View {
     var body: some View {
         HStack(spacing: .zero) {
             biggerSpacer()
-            if session.supportedFeatures.contains(.voice) {
+            if FeatureSwitches.voice {
                 audioControls()
                 flexibleSpacer()
             }
-            if session.supportedFeatures.contains(.video) {
+            if FeatureSwitches.video {
                 videoControls()
                 flexibleSpacer()
                 screenShareButton()
                 flexibleSpacer()
             }
-            if session.supportedFeatures.contains(.text) {
+            if FeatureSwitches.text {
                 textInputButton()
                 flexibleSpacer()
             }

VoiceAgent/FeatureSwitches.swift

@@ -0,0 +1,5 @@
+enum FeatureSwitches {
+    static let voice = true
+    static let video = true
+    static let text = true
+}

VoiceAgent/VoiceAgentApp.swift

@@ -13,7 +13,7 @@ struct VoiceAgentApp: App {
         WindowGroup {
             AppView()
                 .environmentObject(DeviceSwitcher(room: room))
-                .environmentObject(AgentSession(environment: .sandbox(id: sandboxID), context: .init(room: room)))
+                .environmentObject(AgentSession(environment: .sandbox(id: sandboxID), options: .init(room: room)))
         }
         #if os(macOS)
         .defaultSize(width: 900, height: 900)