Code refactor - Phase 1

Sources/UpdateEngine/Sources/UpdateEngineCore/Sources/BuiltInUpdateSources.swift

@@ -54,11 +54,14 @@ public struct AMDUpdateSource: UpdateSource, Sendable {
 
 /// Intel Arc driver update source.
 public struct IntelUpdateSource: UpdateSource, Sendable {
-    public var cacheKey: String { "intel-default" }
-    public var sourceKey: String { cacheKey }
+    public let sourceKey: String
     private let service: IntelService
 
-    public init(service: IntelService = IntelService()) {
+    public init(
+        sourceKey: String = CacheKeyBuilder.build(vendor: "Intel", channel: "default"),
+        service: IntelService = IntelService()
+    ) {
+        self.sourceKey = sourceKey
         self.service = service
     }
 

SwiftBotApp/AIBotsView.swift

@@ -5,29 +5,14 @@ struct AIBotsView: View {
     @State private var showAppleSettings = false
     @State private var showOllamaSettings = false
     @State private var showOpenAISettings = false
-    @State private var baselineSettings = AIBotsSettingsSnapshot()
+    @State private var baselineSettings = AppPreferencesSnapshot()
 
     private var hasUnsavedChanges: Bool {
         currentSettingsSnapshot != baselineSettings
     }
 
-    private var currentSettingsSnapshot: AIBotsSettingsSnapshot {
-        AIBotsSettingsSnapshot(
-            localAIDMReplyEnabled: app.settings.localAIDMReplyEnabled,
-            useAIInGuildChannels: app.settings.behavior.useAIInGuildChannels,
-            allowDMs: app.settings.behavior.allowDMs,
-            preferredAIProvider: app.settings.preferredAIProvider,
-            ollamaBaseURL: app.settings.ollamaBaseURL,
-            ollamaModel: app.settings.localAIModel,
-            ollamaEnabled: app.settings.ollamaEnabled,
-            openAIEnabled: app.settings.openAIEnabled,
-            openAIAPIKey: app.settings.openAIAPIKey,
-            openAIModel: app.settings.openAIModel,
-            openAIImageGenerationEnabled: app.settings.openAIImageGenerationEnabled,
-            openAIImageModel: app.settings.openAIImageModel,
-            openAIImageMonthlyLimitPerUser: app.settings.openAIImageMonthlyLimitPerUser,
-            localAISystemPrompt: app.settings.localAISystemPrompt
-        )
+    private var currentSettingsSnapshot: AppPreferencesSnapshot {
+        app.createPreferencesSnapshot()
     }
 
     var body: some View {
@@ -60,7 +45,9 @@ struct AIBotsView: View {
             if hasUnsavedChanges && !app.isFailoverManagedNode {
                 StickySaveButton(label: "Save AI Settings", systemImage: "square.and.arrow.down.fill") {
                     app.saveSettings()
-                    baselineSettings = currentSettingsSnapshot
+                    withAnimation {
+                        baselineSettings = currentSettingsSnapshot
+                    }
                 }
                 .padding(.trailing, 22)
                 .padding(.bottom, 18)
@@ -559,24 +546,8 @@ private struct EngineStatusStackView: View {
                 .foregroundStyle(isPrimary ? Color.accentColor : Color.secondary)
         }
     }
-}
+    }
 
-private struct AIBotsSettingsSnapshot: Equatable {
-    var localAIDMReplyEnabled = false
-    var useAIInGuildChannels = true
-    var allowDMs = false
-    var preferredAIProvider: AIProviderPreference = .apple
-    var ollamaBaseURL = ""
-    var ollamaModel = ""
-    var ollamaEnabled = true
-    var openAIEnabled = true
-    var openAIAPIKey = ""
-    var openAIModel = ""
-    var openAIImageGenerationEnabled = true
-    var openAIImageModel = ""
-    var openAIImageMonthlyLimitPerUser = 5
-    var localAISystemPrompt = ""
-}
 
 private enum AIEngineStatus {
     case online

SwiftBotApp/AdminWebServer.swift

@@ -569,6 +569,9 @@ actor AdminWebServer {
         loadPersistedSessions()
         let previous = self.config
         self.config = config
+
+        // Refresh the active public base URL so OAuth redirect URIs pick up config changes immediately.
+        self.activePublicBaseURL = resolvedPublicBaseURL(usingTLS: activeTransportUsesTLS)
 
         if !config.enabled {
             await stop()
@@ -1567,7 +1570,6 @@ actor AdminWebServer {
         )
 
         let uri = redirectURI()
-        await logger?("[OAuth] Redirect URI: \(uri)")
 
         var components = URLComponents(string: "https://discord.com/oauth2/authorize")
         components?.queryItems = [
@@ -1956,11 +1958,45 @@ actor AdminWebServer {
     }
 
     private func redirectURI() -> String {
-        let resolvedBase = activePublicBaseURL.isEmpty
+        var resolvedBase = activePublicBaseURL.isEmpty
             ? resolvedPublicBaseURL(usingTLS: config.https != nil)
             : activePublicBaseURL
-        let base = resolvedBase.hasSuffix("/") ? String(resolvedBase.dropLast()) : resolvedBase
-        return base + config.redirectPath
+
+        // Ensure scheme exists
+        if !resolvedBase.isEmpty && !resolvedBase.contains("://") {
+            resolvedBase = "https://" + resolvedBase
+        }
+
+        let path = config.redirectPath.hasPrefix("/") ? config.redirectPath : "/" + config.redirectPath
+
+        Task {
+            await logger?("[OAuth] Constructing redirectURI from base='\(resolvedBase)' and path='\(path)'")
+        }
+
+        guard var components = URLComponents(string: resolvedBase) else {
+            let fallback = resolvedBase + (resolvedBase.hasSuffix("/") ? String(path.dropFirst()) : path)
+            Task {
+                await logger?("[OAuth] redirectURI fallback construction: \(fallback)")
+            }
+            return fallback
+        }
+
+        // Handle existing path in base URL (e.g. proxy subpath)
+        if !components.path.isEmpty && components.path != "/" {
+            let base_path = components.path.hasSuffix("/") ? String(components.path.dropLast()) : components.path
+            let sub_path = path.hasPrefix("/") ? path : "/" + path
+            components.path = base_path + sub_path
+        } else {
+            components.path = path
+        }
+
+        let result = components.url?.absoluteString ?? (resolvedBase + (resolvedBase.hasSuffix("/") ? String(path.dropFirst()) : path))
+
+        Task {
+            await logger?("[OAuth] Resulting redirectURI: \(result)")
+        }
+
+        return result
     }
 
     private func percentEncode(_ value: String) -> String {