refactor: audit phase 0, 1, 2, 3, 5, 6 foundations

Plugins/SQLiteDriverPlugin/SQLitePlugin.swift

@@ -440,6 +440,18 @@ final class SQLitePluginDriver: PluginDatabaseDriver, @unchecked Sendable {
     var supportsSchemas: Bool { false }
     var supportsTransactions: Bool { true }
 
+    var capabilities: PluginCapabilities {
+        [
+            .parameterizedQueries,
+            .transactions,
+            .alterTableDDL,
+            .foreignKeyToggle,
+            .truncateTable,
+            .cancelQuery,
+            .batchExecute,
+        ]
+    }
+
     func quoteIdentifier(_ name: String) -> String {
         let escaped = name.replacingOccurrences(of: "`", with: "``")
         return "`\(escaped)`"

Plugins/TableProPluginKit/PluginCapabilities.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+public struct PluginCapabilities: OptionSet, Sendable {
+    public let rawValue: UInt32
+
+    public init(rawValue: UInt32) {
+        self.rawValue = rawValue
+    }
+
+    public static let materializedViews     = PluginCapabilities(rawValue: 1 << 0)
+    public static let foreignTables         = PluginCapabilities(rawValue: 1 << 1)
+    public static let storedProcedures      = PluginCapabilities(rawValue: 1 << 2)
+    public static let userFunctions         = PluginCapabilities(rawValue: 1 << 3)
+    public static let alterTableDDL         = PluginCapabilities(rawValue: 1 << 4)
+    public static let foreignKeyToggle      = PluginCapabilities(rawValue: 1 << 5)
+    public static let truncateTable         = PluginCapabilities(rawValue: 1 << 6)
+    public static let multiSchema           = PluginCapabilities(rawValue: 1 << 7)
+    public static let parameterizedQueries  = PluginCapabilities(rawValue: 1 << 8)
+    public static let cancelQuery           = PluginCapabilities(rawValue: 1 << 9)
+    public static let batchExecute          = PluginCapabilities(rawValue: 1 << 10)
+    public static let transactions          = PluginCapabilities(rawValue: 1 << 11)
+}

Plugins/TableProPluginKit/PluginDatabaseDriver.swift

@@ -31,6 +31,8 @@ public struct PluginRowChange: Sendable {
 }
 
 public protocol PluginDatabaseDriver: AnyObject, Sendable {
+    var capabilities: PluginCapabilities { get }
+
     // Connection
     func connect() async throws
     func disconnect()
@@ -141,6 +143,8 @@ public protocol PluginDatabaseDriver: AnyObject, Sendable {
 }
 
 public extension PluginDatabaseDriver {
+    var capabilities: PluginCapabilities { [] }
+
     var supportsSchemas: Bool { false }
 
     func fetchSchemas() async throws -> [String] { [] }

Plugins/TableProPluginKit/PluginProcedureFunctionSupport.swift

@@ -0,0 +1,20 @@
+import Foundation
+
+public protocol PluginProcedureFunctionSupport {
+    func fetchProcedures(schema: String?) async throws -> [PluginRoutineInfo]
+    func fetchFunctions(schema: String?) async throws -> [PluginRoutineInfo]
+    func fetchProcedureDDL(name: String, schema: String?) async throws -> String
+    func fetchFunctionDDL(name: String, schema: String?) async throws -> String
+}
+
+public struct PluginRoutineInfo: Codable, Sendable {
+    public let name: String
+    public let returnType: String?
+    public let language: String?
+
+    public init(name: String, returnType: String? = nil, language: String? = nil) {
+        self.name = name
+        self.returnType = returnType
+        self.language = language
+    }
+}

TablePro/Core/Autocomplete/SQLContextAnalyzer.swift

@@ -6,6 +6,17 @@
 //
 
 import Foundation
+import os
+
+private let regexLogger = Logger(subsystem: "com.TablePro", category: "SQLContextAnalyzer.Regex")
+
+private func compileRegex(_ pattern: String, options: NSRegularExpression.Options = []) -> NSRegularExpression {
+    if let regex = try? NSRegularExpression(pattern: pattern, options: options) {
+        return regex
+    }
+    regexLogger.fault("Failed to compile static regex pattern: \(pattern, privacy: .public)")
+    return NSRegularExpression()
+}
 
 /// Type of SQL clause the cursor is in
 enum SQLClauseType {
@@ -188,80 +199,28 @@ final class SQLContextAnalyzer {
             // SELECT is most general
             ("\\bSELECT\\s+[^;]*$", .select),
         ]
-        return patterns.compactMap { pattern, clause in
-            guard let regex = try? NSRegularExpression(
-                pattern: pattern, options: .caseInsensitive
-            ) else {
-                assertionFailure("Invalid SQL clause regex pattern: \(pattern)")
-                return nil
-            }
-            return (regex, clause)
+        return patterns.map { pattern, clause in
+            (compileRegex(pattern, options: .caseInsensitive), clause)
         }
     }()
 
-    /// Pre-compiled regex for removing strings and comments
-    private static let singleQuoteStringRegex: NSRegularExpression = {
-        if let regex = try? NSRegularExpression(pattern: "'[^']*'") {
-            return regex
-        }
-        assertionFailure("Failed to compile singleQuoteStringRegex - invalid pattern")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let singleQuoteStringRegex = compileRegex("'[^']*'")
 
-    private static let doubleQuoteStringRegex: NSRegularExpression = {
-        if let regex = try? NSRegularExpression(pattern: "\"[^\"]*\"") {
-            return regex
-        }
-        assertionFailure("Failed to compile doubleQuoteStringRegex - invalid pattern")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let doubleQuoteStringRegex = compileRegex("\"[^\"]*\"")
 
-    private static let blockCommentRegex: NSRegularExpression = {
-        if let regex = try? NSRegularExpression(pattern: "/\\*[\\s\\S]*?\\*/") {
-            return regex
-        }
-        assertionFailure("Failed to compile blockCommentRegex - invalid pattern")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let blockCommentRegex = compileRegex("/\\*[\\s\\S]*?\\*/")
 
-    private static let lineCommentRegex: NSRegularExpression = {
-        if let regex = try? NSRegularExpression(pattern: "--[^\n]*") {
-            return regex
-        }
-        assertionFailure("Failed to compile lineCommentRegex - invalid pattern")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let lineCommentRegex = compileRegex("--[^\n]*")
 
-    /// Combined regex for removing strings and comments in a single pass (SVC-13)
-    private static let stringsAndCommentsRegex: NSRegularExpression = {
-        // Alternation: single-quoted strings | double-quoted strings | block comments | line comments
-        let pattern = #"'[^']*'|"[^"]*"|/\*[\s\S]*?\*/|--[^\n]*"#
-        if let regex = try? NSRegularExpression(pattern: pattern) {
-            return regex
-        }
-        assertionFailure("Failed to compile stringsAndCommentsRegex - invalid pattern")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let stringsAndCommentsRegex = compileRegex(
+        #"'[^']*'|"[^"]*"|/\*[\s\S]*?\*/|--[^\n]*"#
+    )
 
-    private static let cteFirstRegex: NSRegularExpression = {
-        if let regex = try? NSRegularExpression(
-            pattern: "(?i)\\bWITH\\s+(?:RECURSIVE\\s+)?([\\w]+)\\s+AS\\s*\\("
-        ) {
-            return regex
-        }
-        assertionFailure("Failed to compile cteFirstRegex")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let cteFirstRegex = compileRegex(
+        "(?i)\\bWITH\\s+(?:RECURSIVE\\s+)?([\\w]+)\\s+AS\\s*\\("
+    )
 
-    private static let cteCommaRegex: NSRegularExpression = {
-        if let regex = try? NSRegularExpression(
-            pattern: "(?i),\\s*([\\w]+)\\s+AS\\s*\\("
-        ) {
-            return regex
-        }
-        assertionFailure("Failed to compile cteCommaRegex")
-        return try! NSRegularExpression(pattern: "(?!)")
-    }()
+    private static let cteCommaRegex = compileRegex("(?i),\\s*([\\w]+)\\s+AS\\s*\\(")
 
     private static let tableRefRegexes: [NSRegularExpression] = {
         let patterns = [
@@ -274,7 +233,7 @@ final class SQLContextAnalyzer {
             "(?i)\\bINSERT\\s+INTO\\s+[`\"']?([\\w.]+)[`\"']?",
             "(?i)\\bCREATE\\s+(?:UNIQUE\\s+)?INDEX\\s+\\w+\\s+ON\\s+[`\"']?([\\w.]+)[`\"']?"
         ]
-        return patterns.compactMap { try? NSRegularExpression(pattern: $0) }
+        return patterns.map { compileRegex($0) }
     }()
 
     // MARK: - UTF-16 Helpers

TablePro/Core/Database/DatabaseManager+Sessions.swift

@@ -6,6 +6,7 @@
 //
 
 import AppKit
+import Combine
 import Foundation
 import os
 import TableProPluginKit
@@ -378,13 +379,17 @@ extension DatabaseManager {
     internal func setSession(_ session: ConnectionSession, for connectionId: UUID) {
         activeSessions[connectionId] = session
         connectionStatusVersions[connectionId, default: 0] &+= 1
-        NotificationCenter.default.post(name: .connectionStatusDidChange, object: connectionId)
+        AppEvents.shared.connectionStatusChanged.send(
+            ConnectionStatusChange(connectionId: connectionId, status: session.status)
+        )
     }
 
     internal func removeSessionEntry(for connectionId: UUID) {
         activeSessions.removeValue(forKey: connectionId)
         connectionStatusVersions.removeValue(forKey: connectionId)
-        NotificationCenter.default.post(name: .connectionStatusDidChange, object: connectionId)
+        AppEvents.shared.connectionStatusChanged.send(
+            ConnectionStatusChange(connectionId: connectionId, status: .disconnected)
+        )
     }
 
     #if DEBUG

TablePro/Core/Events/AppEvents.swift

@@ -0,0 +1,23 @@
+//
+//  AppEvents.swift
+//  TablePro
+//
+
+import Combine
+import Foundation
+
+@MainActor
+final class AppEvents {
+    static let shared = AppEvents()
+
+    let themeChanged = PassthroughSubject<Void, Never>()
+
+    let connectionStatusChanged = PassthroughSubject<ConnectionStatusChange, Never>()
+
+    private init() {}
+}
+
+struct ConnectionStatusChange: Sendable {
+    let connectionId: UUID
+    let status: ConnectionStatus
+}

TablePro/Core/Services/AppServices.swift

@@ -0,0 +1,46 @@
+//
+//  AppServices.swift
+//  TablePro
+//
+
+import SwiftUI
+
+@MainActor
+struct AppServices {
+    let appEvents: AppEvents
+    let appSettings: AppSettingsManager
+    let connectionStorage: ConnectionStorage
+    let databaseManager: DatabaseManager
+    let pluginManager: PluginManager
+    let schemaService: SchemaService
+    let queryHistoryStorage: QueryHistoryStorage
+    let sqlFavoriteManager: SQLFavoriteManager
+    let aiChatStorage: AIChatStorage
+    let syncTracker: SyncChangeTracker
+    let themeEngine: ThemeEngine
+
+    static let live = AppServices(
+        appEvents: .shared,
+        appSettings: .shared,
+        connectionStorage: .shared,
+        databaseManager: .shared,
+        pluginManager: .shared,
+        schemaService: .shared,
+        queryHistoryStorage: .shared,
+        sqlFavoriteManager: .shared,
+        aiChatStorage: .shared,
+        syncTracker: .shared,
+        themeEngine: .shared
+    )
+}
+
+private struct AppServicesEnvironmentKey: EnvironmentKey {
+    @MainActor static var defaultValue: AppServices { .live }
+}
+
+extension EnvironmentValues {
+    var appServices: AppServices {
+        get { self[AppServicesEnvironmentKey.self] }
+        set { self[AppServicesEnvironmentKey.self] = newValue }
+    }
+}

TablePro/Core/Services/Infrastructure/AppNotifications.swift

@@ -17,7 +17,6 @@ extension Notification.Name {
     // MARK: - Connections
 
     static let connectionUpdated = Notification.Name("connectionUpdated")
-    static let connectionStatusDidChange = Notification.Name("connectionStatusDidChange")
     static let databaseDidConnect = Notification.Name("databaseDidConnect")
     static let exportConnections = Notification.Name("exportConnections")
     static let importConnections = Notification.Name("importConnections")

TablePro/Core/Services/Infrastructure/MainSplitViewController.swift

@@ -9,6 +9,7 @@
 //
 
 import AppKit
+import Combine
 import os
 import SwiftUI
 
@@ -45,7 +46,7 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
 
     // MARK: - Observers
 
-    private var connectionStatusObserver: NSObjectProtocol?
+    private var connectionStatusCancellable: AnyCancellable?
 
     // MARK: - Init
 
@@ -196,24 +197,17 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
     // MARK: - Observers
 
     private func installObservers() {
-        guard connectionStatusObserver == nil else { return }
-        connectionStatusObserver = NotificationCenter.default.addObserver(
-            forName: .connectionStatusDidChange,
-            object: nil,
-            queue: .main
-        ) { [weak self] _ in
-            MainActor.assumeIsolated {
+        guard connectionStatusCancellable == nil else { return }
+        connectionStatusCancellable = AppEvents.shared.connectionStatusChanged
+            .receive(on: RunLoop.main)
+            .sink { [weak self] _ in
                 self?.handleConnectionStatusChange()
             }
-        }
         handleConnectionStatusChange()
     }
 
     private func removeObservers() {
-        if let observer = connectionStatusObserver {
-            NotificationCenter.default.removeObserver(observer)
-            connectionStatusObserver = nil
-        }
+        connectionStatusCancellable = nil
     }
 
     // MARK: - Toolbar

TablePro/Core/Services/Infrastructure/SettingsNotifications.swift

@@ -21,10 +21,6 @@ extension Notification.Name {
     /// Observers should reload fonts via ThemeEngine.shared.reloadFontCaches().
     static let accessibilityTextSizeDidChange = Notification.Name("accessibilityTextSizeDidChange")
 
-    /// Posted when the active theme changes (colors, fonts, or entire theme switch).
-    /// Used by AppKit components that cannot observe @Observable directly.
-    static let themeDidChange = Notification.Name("themeDidChange")
-
     /// Posted when terminal settings change (font, theme, cursor, etc.)
     /// Used by terminal views to live-update configuration.
     static let terminalSettingsDidChange = Notification.Name("terminalSettingsDidChange")

TablePro/Core/Storage/SSHProfileStorage.swift

@@ -78,11 +78,11 @@ final class SSHProfileStorage {
     }
 
     func deleteProfile(_ profile: SSHProfile) {
-        SyncChangeTracker.shared.markDeleted(.sshProfile, id: profile.id.uuidString)
         var profiles = loadProfiles()
         guard !lastLoadFailed else { return }
         profiles.removeAll { $0.id == profile.id }
         saveProfiles(profiles)
+        SyncChangeTracker.shared.markDeleted(.sshProfile, id: profile.id.uuidString)
 
         deleteSSHPassword(for: profile.id)
         deleteKeyPassphrase(for: profile.id)

TablePro/Core/Storage/TagStorage.swift

@@ -77,10 +77,10 @@ final class TagStorage {
     /// Delete a custom tag (presets cannot be deleted)
     func deleteTag(_ tag: ConnectionTag) {
         guard !tag.isPreset else { return }
-        SyncChangeTracker.shared.markDeleted(.tag, id: tag.id.uuidString)
         var tags = loadTags()
         tags.removeAll { $0.id == tag.id }
         saveTags(tags)
+        SyncChangeTracker.shared.markDeleted(.tag, id: tag.id.uuidString)
     }
 
     /// Get tag by ID