diff --git a/.gitignore b/.gitignore
index b4657ed85..ec408a7c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ dist
 pnpm-lock.yaml
 coverage
 .pnpm-store
+.worktrees/
 .DS_Store
 **/.DS_Store
 apps/macos/.build/
diff --git a/apps/ios/Tests/SwiftUIRenderSmokeTests.swift b/apps/ios/Tests/SwiftUIRenderSmokeTests.swift
index 3cd19aff7..cf44825e8 100644
--- a/apps/ios/Tests/SwiftUIRenderSmokeTests.swift
+++ b/apps/ios/Tests/SwiftUIRenderSmokeTests.swift
@@ -18,9 +18,9 @@ import UIKit
         let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false)
 
         let root = SettingsTab()
-            .environmentObject(appModel)
-            .environmentObject(appModel.voiceWake)
-            .environmentObject(bridgeController)
+            .environment(appModel)
+            .environment(appModel.voiceWake)
+            .environment(bridgeController)
 
         _ = Self.host(root)
     }
@@ -30,9 +30,9 @@ import UIKit
         let bridgeController = BridgeConnectionController(appModel: appModel, startDiscovery: false)
 
         let root = RootTabs()
-            .environmentObject(appModel)
-            .environmentObject(appModel.voiceWake)
-            .environmentObject(bridgeController)
+            .environment(appModel)
+            .environment(appModel.voiceWake)
+            .environment(bridgeController)
 
         _ = Self.host(root)
     }
@@ -41,8 +41,8 @@ import UIKit
         let appModel = NodeAppModel()
 
         let root = VoiceTab()
-            .environmentObject(appModel)
-            .environmentObject(appModel.voiceWake)
+            .environment(appModel)
+            .environment(appModel.voiceWake)
 
         _ = Self.host(root)
     }
@@ -50,7 +50,7 @@ import UIKit
     @Test @MainActor func voiceWakeWordsViewBuildsAViewHierarchy() {
         let appModel = NodeAppModel()
         let root = NavigationStack { VoiceWakeWordsSettingsView() }
-            .environmentObject(appModel)
+            .environment(appModel)
         _ = Self.host(root)
     }
 
@@ -58,8 +58,8 @@ import UIKit
         let appModel = NodeAppModel()
         let bridge = BridgeSession()
         let root = ChatSheet(bridge: bridge, sessionKey: "test")
-            .environmentObject(appModel)
-            .environmentObject(appModel.voiceWake)
+            .environment(appModel)
+            .environment(appModel.voiceWake)
         _ = Self.host(root)
     }
 
diff --git a/apps/macos/Sources/Clawdis/AnthropicOAuth.swift b/apps/macos/Sources/Clawdis/AnthropicOAuth.swift
index 48a605cf7..745f5f793 100644
--- a/apps/macos/Sources/Clawdis/AnthropicOAuth.swift
+++ b/apps/macos/Sources/Clawdis/AnthropicOAuth.swift
@@ -175,7 +175,7 @@ enum PiOAuthStore {
 }
 
 extension Data {
-    private func base64URLEncodedString() -> String {
+    fileprivate func base64URLEncodedString() -> String {
         self.base64EncodedString()
             .replacingOccurrences(of: "+", with: "-")
             .replacingOccurrences(of: "/", with: "_")