Remove agent key, use new props

Author: pblazej

VoiceAgent/App/AppView.swift

@@ -11,7 +11,7 @@ struct AppView: View {
 
     var body: some View {
         ZStack(alignment: .top) {
-            if session.isReady {
+            if session.isConnected {
                 interactions()
             } else {
                 start()
@@ -33,20 +33,20 @@ struct AppView: View {
             }
         #else
             .safeAreaInset(edge: .bottom) {
-                if session.isReady, !keyboardFocus {
+                if session.isConnected, !keyboardFocus {
                     ControlBar(chat: $chat)
                         .transition(.asymmetric(insertion: .move(edge: .bottom).combined(with: .opacity), removal: .opacity))
                 }
             }
         #endif
             .background(.bg1)
             .animation(.default, value: chat)
-            .animation(.default, value: session.isReady)
+            .animation(.default, value: session.isConnected)
             .animation(.default, value: session.error?.localizedDescription)
             .animation(.default, value: localMedia.isCameraEnabled)
             .animation(.default, value: localMedia.isScreenShareEnabled)
         #if os(iOS)
-            .sensoryFeedback(.impact, trigger: session.isListening) { !$0 && $1 }
+            .sensoryFeedback(.impact, trigger: session.agent.agentState) { $0 == nil && $1 == .listening }
         #endif
     }
 

VoiceAgent/ControlBar/ControlBar.swift

@@ -126,7 +126,7 @@ struct ControlBar: View {
             Spacer()
         }
         .frame(width: Constants.buttonWidth)
-        .disabled(!session.hasAgent)
+        .disabled(!session.agent.isConnected)
     }
 
     @ViewBuilder
@@ -146,7 +146,7 @@ struct ControlBar: View {
                 borderColor: .separator1
             )
         )
-        .disabled(!session.hasAgent)
+        .disabled(!session.agent.isConnected)
     }
 
     @ViewBuilder
@@ -166,7 +166,7 @@ struct ControlBar: View {
                 borderColor: .separator1
             )
         )
-        .disabled(!session.hasAgent)
+        .disabled(!session.agent.isConnected)
     }
 
     @ViewBuilder
@@ -186,7 +186,7 @@ struct ControlBar: View {
                 borderColor: .separatorSerious
             )
         )
-        .disabled(session.connectionState == .disconnected)
+        .disabled(!session.isConnected)
     }
 }
 

VoiceAgent/Helpers/Environment.swift

@@ -3,5 +3,4 @@ import SwiftUI
 
 extension EnvironmentValues {
     @Entry var namespace: Namespace.ID? // don't initialize outside View
-    @Entry var agent: Agent?
 }

VoiceAgent/Interactions/TextInteractionView.swift

@@ -10,8 +10,8 @@ import SwiftUI
 ///
 /// Additionally, the view shows a complete chat view with text input capabilities.
 struct TextInteractionView: View {
+    @EnvironmentObject private var session: Session
     @EnvironmentObject private var localMedia: LocalMedia
-    @Environment(\.agent) private var agent
 
     @FocusState.Binding var keyboardFocus: Bool
 
@@ -40,12 +40,12 @@ struct TextInteractionView: View {
         HStack {
             Spacer()
             AgentParticipantView()
-                .frame(maxWidth: agent?.avatarVideoTrack != nil ? 50 * .grid : 25 * .grid)
+                .frame(maxWidth: session.agent.avatarVideoTrack != nil ? 50 * .grid : 25 * .grid)
             ScreenShareView()
             LocalParticipantView()
             Spacer()
         }
-        .frame(height: localMedia.isCameraEnabled || localMedia.isScreenShareEnabled || agent?.avatarVideoTrack != nil ? 50 * .grid : 25 * .grid)
+        .frame(height: localMedia.isCameraEnabled || localMedia.isScreenShareEnabled || session.agent.avatarVideoTrack != nil ? 50 * .grid : 25 * .grid)
         .safeAreaPadding()
     }
 }

VoiceAgent/Participant/AgentParticipantView.swift

@@ -5,18 +5,17 @@ import LiveKitComponents
 /// - Note: If both are unavailable, the view will show a placeholder visualizer.
 struct AgentParticipantView: View {
     @EnvironmentObject private var session: Session
-    @Environment(\.agent) private var agent
     @Environment(\.namespace) private var namespace
     /// Reveals the avatar camera view when true.
     @SceneStorage("videoTransition") private var videoTransition = false
 
     var body: some View {
         ZStack {
-            if let avatarVideoTrack = agent?.avatarVideoTrack {
+            if let avatarVideoTrack = session.agent.avatarVideoTrack {
                 SwiftUIVideoView(avatarVideoTrack)
                     .clipShape(RoundedRectangle(cornerRadius: .cornerRadiusPerPlatform))
                     .aspectRatio(avatarVideoTrack.aspectRatio, contentMode: .fit)
-                    .padding(.horizontal, agent?.avatarVideoTrack?.aspectRatio == 1 ? 4 * .grid : .zero)
+                    .padding(.horizontal, session.agent.avatarVideoTrack?.aspectRatio == 1 ? 4 * .grid : .zero)
                     .shadow(radius: 20, y: 10)
                     .mask(
                         GeometryReader { proxy in
@@ -31,15 +30,15 @@ struct AgentParticipantView: View {
                     .onAppear {
                         videoTransition = true
                     }
-            } else if let audioTrack = agent?.audioTrack {
+            } else if let audioTrack = session.agent.audioTrack {
                 BarAudioVisualizer(audioTrack: audioTrack,
-                                   agentState: agent?.state ?? .listening,
+                                   agentState: session.agent.agentState ?? .listening,
                                    barCount: 5,
                                    barSpacingFactor: 0.05,
                                    barMinOpacity: 0.1)
                     .frame(maxWidth: 75 * .grid, maxHeight: 48 * .grid)
                     .transition(.opacity)
-            } else if session.isReady {
+            } else if session.isConnected {
                 BarAudioVisualizer(audioTrack: nil,
                                    agentState: .listening,
                                    barCount: 1,
@@ -48,7 +47,7 @@ struct AgentParticipantView: View {
                     .transition(.opacity)
             }
         }
-        .animation(.snappy, value: agent?.audioTrack?.id)
+        .animation(.snappy, value: session.agent.audioTrack?.id)
         .matchedGeometryEffect(id: "agent", in: namespace!)
     }
 }

VoiceAgent/VoiceAgentApp.swift

@@ -14,7 +14,7 @@ struct VoiceAgentApp: App {
     // - Create .env.xcconfig with your LIVEKIT_SANDBOX_ID
     private static let sandboxId = Bundle.main.object(forInfoDictionaryKey: "LiveKitSandboxId") as! String
 
-    @StateObject private var session = Session(
+    private let session = Session(
         tokenSource: SandboxTokenSource(id: Self.sandboxId),
         options: SessionOptions(room: Room(roomOptions: RoomOptions(defaultScreenShareCaptureOptions: ScreenShareCaptureOptions(useBroadcastExtension: true))))
     )
@@ -23,7 +23,6 @@ struct VoiceAgentApp: App {
         WindowGroup {
             AppView()
                 .environmentObject(session)
-                .environment(\.agent, session.agent)
                 .environmentObject(LocalMedia(session: session))
         }
         #if os(macOS)