Add unified logging and improve code quality

- Add os.Logger throughout the codebase, replacing print() statements
- Forward broker output to unified logging system with level parsing
- Fix epithet binary path resolution when running from Xcode (DEBUG)
- Fix Selector("undo:") warnings with #selector(UndoManager.undo)
- Add nonEmptyOrNil String extension for cleaner nil coalescing
- Extract magic numbers to named constants in InspectWindowController

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: brianm

Sources/EpithetAgent/AppDelegate.swift

@@ -1,11 +1,16 @@
 import AppKit
+import os
+
+private let logger = Logger(subsystem: "dev.epithet.agent", category: "AppDelegate")
 
 class AppDelegate: NSObject, NSApplicationDelegate {
     private var statusBarController: StatusBarController?
     private let brokerManager = BrokerManager.shared
     private let sshConfigManager = SSHConfigManager.shared
 
     func applicationDidFinishLaunching(_ notification: Notification) {
+        logger.notice("EpithetAgent starting")
+        
         // Setup main menu with Edit commands (needed for copy/paste in text fields)
         setupMainMenu()
 
@@ -32,8 +37,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Edit menu (for copy/paste support)
         let editMenuItem = NSMenuItem()
         let editMenu = NSMenu(title: "Edit")
-        editMenu.addItem(NSMenuItem(title: "Undo", action: Selector("undo:"), keyEquivalent: "z"))
-        editMenu.addItem(NSMenuItem(title: "Redo", action: Selector("redo:"), keyEquivalent: "Z"))
+        editMenu.addItem(NSMenuItem(title: "Undo", action: #selector(UndoManager.undo), keyEquivalent: "z"))
+        editMenu.addItem(NSMenuItem(title: "Redo", action: #selector(UndoManager.redo), keyEquivalent: "Z"))
         editMenu.addItem(NSMenuItem.separator())
         editMenu.addItem(NSMenuItem(title: "Cut", action: #selector(NSText.cut(_:)), keyEquivalent: "x"))
         editMenu.addItem(NSMenuItem(title: "Copy", action: #selector(NSText.copy(_:)), keyEquivalent: "c"))

Sources/EpithetAgent/BrokerConfigStore.swift

@@ -1,4 +1,7 @@
 import Foundation
+import os
+
+private let logger = Logger(subsystem: "dev.epithet.agent", category: "ConfigStore")
 
 class BrokerConfigStore {
     static let shared = BrokerConfigStore()
@@ -36,7 +39,7 @@ class BrokerConfigStore {
             let container = try JSONDecoder().decode(ConfigContainer.self, from: data)
             brokers = container.brokers
         } catch {
-            print("Failed to load broker configs: \(error)")
+            logger.error("Failed to load broker configs: \(error)")
             brokers = []
         }
     }
@@ -48,7 +51,7 @@ class BrokerConfigStore {
             try data.write(to: configFileURL, options: .atomic)
             onChange?()
         } catch {
-            print("Failed to save broker configs: \(error)")
+            logger.error("Failed to save broker configs: \(error)")
         }
     }
 

Sources/EpithetAgent/BrokerManager.swift

@@ -1,5 +1,49 @@
 import Foundation
 import AppKit
+import os
+
+private let logger = Logger(subsystem: "dev.epithet.agent", category: "BrokerManager")
+
+/// Creates a Logger for a specific broker's output.
+private func brokerLogger(name: String) -> Logger {
+    Logger(subsystem: "dev.epithet.agent", category: "Broker:\(name)")
+}
+
+/// Parses a log line from the epithet binary and extracts the level and message.
+/// Format: "[ANSI]HH:MM:SS[ANSI] [ANSI]LVL[ANSI] message" where LVL is DBG/INF/WRN/ERR
+private func parseLogLine(_ line: String) -> (level: OSLogType, message: String)? {
+    // Strip ANSI escape codes: \x1B[...m
+    let stripped = line.replacingOccurrences(
+        of: "\\x1B\\[[0-9;]*m",
+        with: "",
+        options: .regularExpression
+    )
+    
+    // Format after stripping: "HH:MM:SS LVL message..."
+    // Find the level token after the timestamp.
+    let parts = stripped.split(separator: " ", maxSplits: 2, omittingEmptySubsequences: true)
+    guard parts.count >= 2 else { return nil }
+    
+    let levelStr = String(parts[1])
+    let message = parts.count > 2 ? String(parts[2]) : ""
+    
+    let level: OSLogType
+    switch levelStr {
+    case "DBG":
+        level = .debug
+    case "INF":
+        level = .info
+    case "WRN":
+        level = .default  // .warning doesn't exist, use .default
+    case "ERR":
+        level = .error
+    default:
+        // Not a standard log line, treat as info.
+        return (.info, stripped)
+    }
+    
+    return (level, message)
+}
 
 class BrokerManager {
     static let shared = BrokerManager()
@@ -24,21 +68,34 @@ class BrokerManager {
     private init() {}
 
     var epithetBinaryPath: String {
-        // When running from bundle, use bundled binary
+        // When running from bundle, use bundled binary.
         if let resourcePath = Bundle.main.resourcePath {
             let bundledPath = (resourcePath as NSString).appendingPathComponent("epithet")
             if FileManager.default.fileExists(atPath: bundledPath) {
                 return bundledPath
             }
         }
-        // Fallback for development: use Resources/epithet relative to executable
+        // Fallback for development: use Resources/epithet relative to executable.
         let executablePath = Bundle.main.executablePath ?? ""
         let executableDir = (executablePath as NSString).deletingLastPathComponent
         let devPath = (executableDir as NSString).appendingPathComponent("../../Resources/epithet")
         if FileManager.default.fileExists(atPath: devPath) {
             return (devPath as NSString).standardizingPath
         }
-        // Last resort: check current directory
+        // When running from Xcode, try the source directory.
+        // The executable is in DerivedData, but we can find the source via the project structure.
+        #if DEBUG
+        let sourceResourcesPath = URL(fileURLWithPath: #file)
+            .deletingLastPathComponent()  // Sources/EpithetAgent
+            .deletingLastPathComponent()  // Sources
+            .deletingLastPathComponent()  // epithet-macos
+            .appendingPathComponent("Resources/epithet")
+            .path
+        if FileManager.default.fileExists(atPath: sourceResourcesPath) {
+            return sourceResourcesPath
+        }
+        #endif
+        // Last resort: check current directory.
         return "./Resources/epithet"
     }
 
@@ -56,7 +113,7 @@ class BrokerManager {
 
     func start(broker: BrokerConfig) {
         guard states[broker.name]?.isRunning != true else {
-            print("Broker \(broker.name) is already running")
+            logger.debug("Broker \(broker.name) is already running")
             return
         }
 
@@ -127,6 +184,17 @@ class BrokerManager {
             logs[brokerName] = String(log.suffix(Self.trimmedLogSize))
         }
 
+        // Forward each line to the unified logger.
+        let brokerLog = brokerLogger(name: brokerName)
+        for line in text.split(separator: "\n", omittingEmptySubsequences: true) {
+            let lineStr = String(line)
+            if let (level, message) = parseLogLine(lineStr) {
+                brokerLog.log(level: level, "\(message)")
+            } else {
+                brokerLog.info("\(lineStr)")
+            }
+        }
+
         onLogUpdate?(brokerName)
     }
 

Sources/EpithetAgent/ConfigurationWindowController.swift

@@ -1,5 +1,12 @@
 import AppKit
 
+// Extension to convert empty strings to nil
+extension String {
+    var nonEmptyOrNil: String? {
+        isEmpty ? nil : self
+    }
+}
+
 class ConfigurationWindowController: NSWindowController {
     private let configStore = BrokerConfigStore.shared
     private let brokerManager = BrokerManager.shared
@@ -605,10 +612,10 @@ class ConfigurationWindowController: NSWindowController {
         broker.name = nameField.stringValue
         broker.caURLs = currentCAURLs
         broker.authMethod = AuthMethod.allCases[authMethodPopup.indexOfSelectedItem]
-        broker.oidcIssuer = oidcIssuerField.stringValue.isEmpty ? nil : oidcIssuerField.stringValue
-        broker.oidcClientID = oidcClientIDField.stringValue.isEmpty ? nil : oidcClientIDField.stringValue
-        broker.oidcClientSecret = oidcClientSecretField.stringValue.isEmpty ? nil : oidcClientSecretField.stringValue
-        broker.authCommand = authCommandField.stringValue.isEmpty ? nil : authCommandField.stringValue
+        broker.oidcIssuer = oidcIssuerField.stringValue.nonEmptyOrNil
+        broker.oidcClientID = oidcClientIDField.stringValue.nonEmptyOrNil
+        broker.oidcClientSecret = oidcClientSecretField.stringValue.nonEmptyOrNil
+        broker.authCommand = authCommandField.stringValue.nonEmptyOrNil
         broker.caTimeout = Int(caTimeoutField.stringValue) ?? 15
         broker.caCooldown = Int(caCooldownField.stringValue) ?? 600
         broker.verbosity = Verbosity.allCases[verbosityPopup.indexOfSelectedItem]

Sources/EpithetAgent/InspectWindowController.swift

@@ -4,6 +4,10 @@ class InspectWindowController: NSWindowController {
     private let brokerManager = BrokerManager.shared
     private let configStore = BrokerConfigStore.shared
 
+    // Constants
+    private static let autoRefreshInterval: TimeInterval = 30.0
+    private static let inspectSplitRatio: CGFloat = 0.55
+
     private var tabView: NSTabView!
     private var noRunningBrokersLabel: NSTextField!
     private var refreshButton: NSButton!
@@ -141,7 +145,7 @@ class InspectWindowController: NSWindowController {
 
         // Set initial split position (55% inspect, 45% logs)
         DispatchQueue.main.async {
-            splitView.setPosition(splitView.bounds.height * 0.55, ofDividerAt: 0)
+            splitView.setPosition(splitView.bounds.height * Self.inspectSplitRatio, ofDividerAt: 0)
         }
 
         return splitView
@@ -256,7 +260,7 @@ class InspectWindowController: NSWindowController {
 
     @objc private func toggleAutoRefresh(_ sender: NSButton) {
         if sender.state == .on {
-            autoRefreshTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) { [weak self] _ in
+            autoRefreshTimer = Timer.scheduledTimer(withTimeInterval: Self.autoRefreshInterval, repeats: true) { [weak self] _ in
                 self?.refresh()
             }
         } else {

Sources/EpithetAgent/SSHConfigManager.swift

@@ -1,4 +1,7 @@
 import Foundation
+import os
+
+private let logger = Logger(subsystem: "dev.epithet.agent", category: "SSHConfig")
 
 class SSHConfigManager {
     static let shared = SSHConfigManager()
@@ -57,7 +60,7 @@ class SSHConfigManager {
             // Ensure proper permissions.
             try fileManager.setAttributes([.posixPermissions: 0o600], ofItemAtPath: sshConfigPath)
         } catch {
-            print("Failed to update SSH config: \(error)")
+            logger.error("Failed to update SSH config: \(error)")
         }
     }
 }

Sources/EpithetAgent/StatusBarController.swift

@@ -1,5 +1,8 @@
 import AppKit
 import ServiceManagement
+import os
+
+private let logger = Logger(subsystem: "dev.epithet.agent", category: "StatusBar")
 
 class StatusBarController {
     private var statusItem: NSStatusItem
@@ -108,7 +111,7 @@ class StatusBarController {
                     launchAtLoginItem.state = .on
                 }
             } catch {
-                print("Failed to toggle launch at login: \(error)")
+                logger.error("Failed to toggle launch at login: \(error)")
             }
         }
     }