Merge pull request 'Add TFL train disruption alerts' (#5) from feat-tflalerts into main

Reviewed-on: kennethnym/aris#5

IrisCompanion/iris/ContentView.swift

@@ -9,6 +9,7 @@ import SwiftUI
 
 struct ContentView: View {
     @EnvironmentObject private var orchestrator: ContextOrchestrator
+    @StateObject private var stockSettings = StockSettingsStore()
 
     var body: some View {
         TabView {
@@ -18,6 +19,12 @@ struct ContentView: View {
                 .tabItem { Label("Orchestrator", systemImage: "bolt.horizontal.circle") }
             TodosView()
                 .tabItem { Label("Todos", systemImage: "checklist") }
+            NavigationStack {
+                StockSettingsView(store: stockSettings)
+            }
+            .tabItem { Label("Stocks", systemImage: "chart.line.uptrend.xyaxis") }
+            SettingsView()
+                .tabItem { Label("Settings", systemImage: "gearshape") }
         }
         .onAppear { orchestrator.start() }
     }
@@ -27,10 +34,12 @@ struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         if #available(iOS 16.0, *) {
             let ble = BlePeripheralManager()
-            let orchestrator = ContextOrchestrator(ble: ble)
+            let spotifyAuth = SpotifyAuthManager()
+            let orchestrator = ContextOrchestrator(ble: ble, spotifyAuth: spotifyAuth)
             ContentView()
                 .environmentObject(ble)
                 .environmentObject(orchestrator)
+                .environmentObject(spotifyAuth)
         } else {
             ContentView()
         }

IrisCompanion/iris/DataSources/StockDataSource.swift

@@ -0,0 +1,177 @@
+//
+//  StockDataSource.swift
+//  iris
+//
+
+import Foundation
+
+struct StockDataSourceConfig: Sendable {
+    var maxSymbols: Int = 5
+    var cacheValiditySec: Int = 300
+    var ttlSec: Int = 600
+
+    init() {}
+}
+
+final class StockDataSource {
+    struct StockQuote: Sendable, Equatable {
+        let symbol: String
+        let shortName: String
+        let price: Double
+        let change: Double
+        let changePercent: Double
+        let marketState: String
+    }
+
+    struct StockData: Sendable, Equatable {
+        let quotes: [StockQuote]
+    }
+
+    struct Snapshot: Sendable {
+        let data: StockData
+        let diagnostics: [String: String]
+    }
+
+    enum StockError: Error, LocalizedError, Sendable {
+        case noSymbolsConfigured
+        case networkFailed(message: String, diagnostics: [String: String])
+        case rateLimited(diagnostics: [String: String])
+        case invalidResponse(diagnostics: [String: String])
+
+        var errorDescription: String? {
+            switch self {
+            case .noSymbolsConfigured:
+                return "No symbols configured"
+            case .networkFailed(let message, _):
+                return message
+            case .rateLimited:
+                return "Rate limited by Yahoo Finance"
+            case .invalidResponse:
+                return "Invalid response from Yahoo Finance"
+            }
+        }
+    }
+
+    private let config: StockDataSourceConfig
+    private var cache: (timestamp: Int, data: StockData)?
+
+    init(config: StockDataSourceConfig = .init()) {
+        self.config = config
+    }
+
+    func dataWithDiagnostics(symbols: [String], now: Int) async throws -> Snapshot {
+        var diagnostics: [String: String] = [
+            "now": String(now),
+            "symbols_requested": symbols.joined(separator: ","),
+            "max_symbols": String(config.maxSymbols),
+        ]
+
+        guard !symbols.isEmpty else {
+            diagnostics["result"] = "no_symbols"
+            return Snapshot(data: StockData(quotes: []), diagnostics: diagnostics)
+        }
+
+        let limitedSymbols = Array(symbols.prefix(config.maxSymbols))
+        diagnostics["symbols_queried"] = limitedSymbols.joined(separator: ",")
+
+        if let cache = cache, now - cache.timestamp < config.cacheValiditySec {
+            diagnostics["source"] = "cache"
+            diagnostics["cache_age_sec"] = String(now - cache.timestamp)
+            return Snapshot(data: cache.data, diagnostics: diagnostics)
+        }
+
+        // Fetch each symbol using v8 chart API (supports one symbol per request)
+        var quotes: [StockQuote] = []
+        var fetchErrors: [String] = []
+
+        for symbol in limitedSymbols {
+            do {
+                if let quote = try await fetchQuote(symbol: symbol) {
+                    quotes.append(quote)
+                }
+            } catch {
+                fetchErrors.append("\(symbol): \(error.localizedDescription)")
+            }
+        }
+
+        diagnostics["source"] = "network"
+        diagnostics["quotes_returned"] = String(quotes.count)
+        if !fetchErrors.isEmpty {
+            diagnostics["fetch_errors"] = fetchErrors.joined(separator: "; ")
+        }
+
+        let stockData = StockData(quotes: quotes)
+        cache = (timestamp: now, data: stockData)
+
+        return Snapshot(data: stockData, diagnostics: diagnostics)
+    }
+
+    private func fetchQuote(symbol: String) async throws -> StockQuote? {
+        guard let encodedSymbol = symbol.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed),
+              let url = URL(string: "https://query1.finance.yahoo.com/v8/finance/chart/\(encodedSymbol)?interval=1d&range=1d") else {
+            return nil
+        }
+
+        var request = URLRequest(url: url)
+        request.setValue("Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X)", forHTTPHeaderField: "User-Agent")
+        request.setValue("application/json", forHTTPHeaderField: "Accept")
+
+        let (data, response) = try await URLSession.shared.data(for: request)
+
+        if let httpResponse = response as? HTTPURLResponse {
+            guard (200..<300).contains(httpResponse.statusCode) else {
+                throw StockError.networkFailed(message: "HTTP \(httpResponse.statusCode)", diagnostics: [:])
+            }
+        }
+
+        let chartResponse = try JSONDecoder().decode(YahooChartResponse.self, from: data)
+
+        guard let result = chartResponse.chart.result?.first,
+              let meta = result.meta,
+              let price = meta.regularMarketPrice else {
+            return nil
+        }
+
+        let previousClose = meta.chartPreviousClose ?? meta.previousClose ?? price
+        let change = price - previousClose
+        let changePercent = previousClose > 0 ? (change / previousClose) * 100 : 0
+
+        return StockQuote(
+            symbol: meta.symbol ?? symbol,
+            shortName: meta.shortName ?? meta.symbol ?? symbol,
+            price: price,
+            change: change,
+            changePercent: changePercent,
+            marketState: meta.marketState ?? "CLOSED"
+        )
+    }
+}
+
+// MARK: - Yahoo Finance v8 Chart API Response Models
+
+private struct YahooChartResponse: Codable {
+    let chart: Chart
+
+    struct Chart: Codable {
+        let result: [ChartResult]?
+        let error: ChartError?
+    }
+
+    struct ChartResult: Codable {
+        let meta: ChartMeta?
+    }
+
+    struct ChartMeta: Codable {
+        let symbol: String?
+        let shortName: String?
+        let regularMarketPrice: Double?
+        let chartPreviousClose: Double?
+        let previousClose: Double?
+        let marketState: String?
+    }
+
+    struct ChartError: Codable {
+        let code: String?
+        let description: String?
+    }
+}

IrisCompanion/iris/DataSources/TFLDataSource.swift

@@ -0,0 +1,193 @@
+//
+//  TFLDataSource.swift
+//  iris
+//
+
+import Foundation
+
+struct TFLDataSourceConfig: Sendable {
+    var cacheValiditySec: Int = 120
+    var ttlSec: Int = 300
+    var maxDisruptions: Int = 3
+
+    init() {}
+}
+
+@MainActor
+final class TFLDataSource {
+    struct Disruption: Sendable, Equatable {
+        let id: String
+        let lineName: String
+        let lineId: String
+        let severity: Int
+        let severityDescription: String
+        let reason: String?
+        let isMajor: Bool
+    }
+
+    struct TFLData: Sendable, Equatable {
+        let disruptions: [Disruption]
+    }
+
+    struct Snapshot: Sendable {
+        let data: TFLData
+        let diagnostics: [String: String]
+    }
+
+    enum TFLError: Error, LocalizedError, Sendable {
+        case networkFailed(message: String, diagnostics: [String: String])
+        case invalidResponse(diagnostics: [String: String])
+
+        var errorDescription: String? {
+            switch self {
+            case .networkFailed(let message, _):
+                return message
+            case .invalidResponse:
+                return "Invalid TFL response"
+            }
+        }
+    }
+
+    // Severity 4 = Planned Closure, 5 = Part Closure, 10 = Good Service
+    private static let ignoredSeverities: Set<Int> = [4, 5, 10]
+    // Severity 1 = Closed, 2 = Suspended, 3 = Part Suspended, 6 = Severe Delays
+    private static let majorSeverities: Set<Int> = [1, 2, 3, 6]
+
+    private let config: TFLDataSourceConfig
+    private var cache: (timestamp: Int, data: TFLData)?
+
+    var ttlSec: Int { config.ttlSec }
+
+    init(config: TFLDataSourceConfig = .init()) {
+        self.config = config
+    }
+
+    func dataWithDiagnostics(now: Int) async throws -> Snapshot {
+        var diagnostics: [String: String] = [
+            "now": String(now),
+            "cache_validity_sec": String(config.cacheValiditySec),
+        ]
+
+        if let cache = cache, now - cache.timestamp < config.cacheValiditySec {
+            diagnostics["source"] = "cache"
+            diagnostics["cache_age_sec"] = String(now - cache.timestamp)
+            return Snapshot(data: cache.data, diagnostics: diagnostics)
+        }
+
+        guard let url = URL(string: "https://api.tfl.gov.uk/Line/Mode/tube,elizabeth-line/Status") else {
+            throw TFLError.invalidResponse(diagnostics: diagnostics)
+        }
+
+        var request = URLRequest(url: url)
+        request.setValue("application/json", forHTTPHeaderField: "Accept")
+
+        let (data, response) = try await URLSession.shared.data(for: request)
+
+        if let httpResponse = response as? HTTPURLResponse {
+            diagnostics["http_status"] = String(httpResponse.statusCode)
+            guard (200..<300).contains(httpResponse.statusCode) else {
+                throw TFLError.networkFailed(
+                    message: "HTTP \(httpResponse.statusCode)",
+                    diagnostics: diagnostics
+                )
+            }
+        }
+
+        let lines = try JSONDecoder().decode([TFLLineStatus].self, from: data)
+        diagnostics["source"] = "network"
+        diagnostics["lines_returned"] = String(lines.count)
+
+        var disruptions: [Disruption] = []
+        var seenLines: Set<String> = []
+
+        for line in lines {
+            guard !seenLines.contains(line.id) else { continue }
+
+            for status in line.lineStatuses {
+                guard !Self.ignoredSeverities.contains(status.statusSeverity) else { continue }
+
+                seenLines.insert(line.id)
+                let isMajor = Self.majorSeverities.contains(status.statusSeverity)
+
+                let disruption = Disruption(
+                    id: "\(line.id):\(status.statusSeverity)",
+                    lineName: line.name,
+                    lineId: line.id,
+                    severity: status.statusSeverity,
+                    severityDescription: status.statusSeverityDescription,
+                    reason: status.reason ?? status.disruption?.description,
+                    isMajor: isMajor
+                )
+                disruptions.append(disruption)
+                break
+            }
+        }
+
+        disruptions.sort { $0.severity < $1.severity }
+
+        let limited = Array(disruptions.prefix(config.maxDisruptions))
+        diagnostics["disruptions_found"] = String(disruptions.count)
+        diagnostics["disruptions_returned"] = String(limited.count)
+
+        let tflData = TFLData(disruptions: limited)
+        cache = (timestamp: now, data: tflData)
+
+        return Snapshot(data: tflData, diagnostics: diagnostics)
+    }
+
+    func disruptionTitle(_ disruption: Disruption) -> String {
+        var name = disruption.lineName
+        name = name.replacingOccurrences(of: " & City", with: "")
+        name = name.replacingOccurrences(of: "Hammersmith", with: "H'smith")
+        name = name.replacingOccurrences(of: "Metropolitan", with: "Met")
+        name = name.replacingOccurrences(of: "Waterloo", with: "W'loo")
+        name = name.replacingOccurrences(of: "Elizabeth line", with: "Eliz.")
+
+        var severity = disruption.severityDescription
+        severity = severity.replacingOccurrences(of: "Minor Delays", with: "Delays")
+        severity = severity.replacingOccurrences(of: "Severe Delays", with: "Severe")
+        severity = severity.replacingOccurrences(of: "Part Closure", with: "Part Closed")
+        severity = severity.replacingOccurrences(of: "Part Suspended", with: "Part Susp.")
+
+        return "\(name): \(severity)"
+    }
+
+    func disruptionSubtitle(_ disruption: Disruption) -> String {
+        guard let reason = disruption.reason else {
+            return "Check TFL for details"
+        }
+        let phrases = reason.components(separatedBy: ".")
+        if let first = phrases.first?.trimmingCharacters(in: .whitespacesAndNewlines), !first.isEmpty {
+            return first
+        }
+        return "Check TFL for details"
+    }
+}
+
+// MARK: - TFL API Response Models
+
+private struct TFLLineStatus: Codable {
+    let id: String
+    let name: String
+    let modeName: String
+    let lineStatuses: [LineStatus]
+
+    struct LineStatus: Codable {
+        let statusSeverity: Int
+        let statusSeverityDescription: String
+        let reason: String?
+        let validityPeriods: [ValidityPeriod]?
+        let disruption: Disruption?
+    }
+
+    struct ValidityPeriod: Codable {
+        let fromDate: String?
+        let toDate: String?
+    }
+
+    struct Disruption: Codable {
+        let category: String?
+        let description: String?
+        let closureText: String?
+    }
+}

IrisCompanion/iris/Info.plist

@@ -2,6 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>sh.nym.iris.spotify-auth</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>iris-spotify-auth</string>
+			</array>
+		</dict>
+	</array>
 	<key>MKDirectionsApplicationSupportedModes</key>
 	<array/>
 	<key>NSCalendarsFullAccessUsageDescription</key>

IrisCompanion/iris/Models/HeuristicRanker.swift

@@ -86,10 +86,12 @@ final class HeuristicRanker {
         switch type {
         case .weatherWarning: return 1.0
         case .weatherAlert: return 0.9
+        case .transitAlert: return 0.85
         case .calendarEvent: return 0.8
         case .transit: return 0.75
         case .poiNearby: return 0.6
         case .info: return 0.4
+        case .stock: return 0.3
         case .nowPlaying: return 0.25
         case .currentWeather: return 0.0
         case .allQuiet: return 0.0

IrisCompanion/iris/Models/StockSettingsStore.swift

@@ -0,0 +1,48 @@
+//
+//  StockSettingsStore.swift
+//  iris
+//
+
+import Foundation
+import Combine
+
+@MainActor
+final class StockSettingsStore: ObservableObject {
+    nonisolated static let userDefaultsKey = "iris.stock.symbols"
+
+    @Published private(set) var symbols: [String] = []
+
+    private let maxSymbols = 5
+
+    init() {
+        loadSymbols()
+    }
+
+    private func loadSymbols() {
+        symbols = UserDefaults.standard.stringArray(forKey: Self.userDefaultsKey) ?? []
+    }
+
+    func saveSymbols(_ newSymbols: [String]) {
+        let cleaned = newSymbols
+            .map { $0.uppercased().trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+            .prefix(maxSymbols)
+        symbols = Array(cleaned)
+        UserDefaults.standard.set(symbols, forKey: Self.userDefaultsKey)
+    }
+
+    @discardableResult
+    func addSymbol(_ symbol: String) -> Bool {
+        guard symbols.count < maxSymbols else { return false }
+        let cleaned = symbol.uppercased().trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !cleaned.isEmpty, !symbols.contains(cleaned) else { return false }
+        symbols.append(cleaned)
+        UserDefaults.standard.set(symbols, forKey: Self.userDefaultsKey)
+        return true
+    }
+
+    func removeSymbol(_ symbol: String) {
+        symbols.removeAll { $0 == symbol.uppercased() }
+        UserDefaults.standard.set(symbols, forKey: Self.userDefaultsKey)
+    }
+}

IrisCompanion/iris/Models/Winner.swift

@@ -16,5 +16,7 @@ enum FeedItemType: String, Codable, CaseIterable {
     case nowPlaying = "NOW_PLAYING"
     case currentWeather = "CURRENT_WEATHER"
     case calendarEvent = "CALENDAR_EVENT"
+    case stock = "STOCK"
+    case transitAlert = "TRANSIT_ALERT"
     case allQuiet = "ALL_QUIET"
 }

IrisCompanion/iris/Orchestrator/ContextOrchestrator.swift

@@ -24,8 +24,18 @@ final class ContextOrchestrator: NSObject, ObservableObject {
     @Published private(set) var lastCalendarDiagnostics: [String: String] = [:]
     @Published private(set) var lastPipelineElapsedMs: Int? = nil
     @Published private(set) var lastFetchFailed: Bool = false
+    @Published private(set) var lastTFLDiagnostics: [String: String] = [:]
     @Published private(set) var musicAuthorization: MusicAuthorization.Status = .notDetermined
     @Published private(set) var nowPlaying: NowPlayingSnapshot? = nil
+    @Published private(set) var spotifyNowPlaying: SpotifyNowPlaying? = nil
+    @Published var musicSource: MusicSource = .appleMusic {
+        didSet {
+            if oldValue != musicSource {
+                switchMusicMonitor()
+                UserDefaults.standard.set(musicSource.rawValue, forKey: "music_source")
+            }
+        }
+    }
 
     private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "iris", category: "ContextOrchestrator")
 
@@ -33,11 +43,15 @@ final class ContextOrchestrator: NSObject, ObservableObject {
     private let weatherDataSource = WeatherDataSource()
     private let calendarDataSource = CalendarDataSource()
     private let poiDataSource = POIDataSource()
+    private let stockDataSource = StockDataSource()
+    private let tflDataSource = TFLDataSource()
     private let ranker: HeuristicRanker
     private let store: FeedStore
     private let server: LocalServer
     private let ble: BlePeripheralManager
     private let nowPlayingMonitor = NowPlayingMonitor()
+    private let spotifyMonitor: SpotifyNowPlayingMonitor
+    private let spotifyAuth: SpotifyAuthManager
 
     private var lastRecomputeLocation: CLLocation? = nil
     private var lastRecomputeAccuracy: CLLocationAccuracy? = nil
@@ -46,11 +60,20 @@ final class ContextOrchestrator: NSObject, ObservableObject {
 
     init(store: FeedStore = FeedStore(),
          server: LocalServer = LocalServer(),
-         ble: BlePeripheralManager) {
+         ble: BlePeripheralManager,
+         spotifyAuth: SpotifyAuthManager) {
         self.store = store
         self.server = server
         self.ble = ble
+        self.spotifyAuth = spotifyAuth
+        self.spotifyMonitor = SpotifyNowPlayingMonitor(authManager: spotifyAuth)
         self.ranker = HeuristicRanker(lastShownAt: { id in store.lastShownAt(feedItemId: id) })
+
+        if let savedSource = UserDefaults.standard.string(forKey: "music_source"),
+           let source = MusicSource(rawValue: savedSource) {
+            self.musicSource = source
+        }
+
         super.init()
 
         locationManager.delegate = self
@@ -73,13 +96,21 @@ final class ContextOrchestrator: NSObject, ObservableObject {
 
         nowPlayingMonitor.onUpdate = { [weak self] update in
             Task { @MainActor in
-                guard let self else { return }
+                guard let self, self.musicSource == .appleMusic else { return }
                 self.musicAuthorization = update.authorization
                 self.nowPlaying = update.snapshot
                 self.pushLatestFeedToBle()
             }
         }
 
+        spotifyMonitor.onUpdate = { [weak self] update in
+            Task { @MainActor in
+                guard let self, self.musicSource == .spotify else { return }
+                self.spotifyNowPlaying = update.snapshot
+                self.pushLatestFeedToBle()
+            }
+        }
+
         let feed = store.getFeed()
         lastFeed = feed
     }
@@ -88,7 +119,7 @@ final class ContextOrchestrator: NSObject, ObservableObject {
         authorization = locationManager.authorizationStatus
         logger.info("start auth=\(String(describing: self.authorization), privacy: .public)")
         server.start()
-        nowPlayingMonitor.start()
+        startMusicMonitor()
         requestPermissionsIfNeeded()
         locationManager.startUpdatingLocation()
     }
@@ -96,6 +127,27 @@ final class ContextOrchestrator: NSObject, ObservableObject {
     func stop() {
         locationManager.stopUpdatingLocation()
         nowPlayingMonitor.stop()
+        spotifyMonitor.stop()
+    }
+
+    private func startMusicMonitor() {
+        switch musicSource {
+        case .appleMusic:
+            nowPlayingMonitor.start()
+        case .spotify:
+            spotifyMonitor.start()
+        }
+    }
+
+    private func switchMusicMonitor() {
+        nowPlayingMonitor.stop()
+        spotifyMonitor.stop()
+        nowPlaying = nil
+        spotifyNowPlaying = nil
+
+        startMusicMonitor()
+        pushLatestFeedToBle()
+        logger.info("Switched music source to \(self.musicSource.rawValue)")
     }
 
     func recomputeNow(reason: String = "manual") {
@@ -204,10 +256,19 @@ final class ContextOrchestrator: NSObject, ObservableObject {
         async let poiResult = withTimeoutResult(seconds: 6) {
             try await self.poiDataSource.data(for: location, now: nowEpoch)
         }
+        let stockSymbols = UserDefaults.standard.stringArray(forKey: StockSettingsStore.userDefaultsKey) ?? []
+        async let stockResult = withTimeoutResult(seconds: 6) {
+            try await self.stockDataSource.dataWithDiagnostics(symbols: stockSymbols, now: nowEpoch)
+        }
+        async let tflResult = withTimeoutResult(seconds: 6) {
+            try await self.tflDataSource.dataWithDiagnostics(now: nowEpoch)
+        }
 
         let wxRes = await weatherResult
         let calRes = await calendarResult
         let poiRes = await poiResult
+        let stockRes = await stockResult
+        let tflRes = await tflResult
 
         func calendarTTL(endAt: Int, now: Int) -> Int {
             let ttl = endAt - now
@@ -223,6 +284,8 @@ final class ContextOrchestrator: NSObject, ObservableObject {
         var rightNowCandidates: [HeuristicRanker.Ranked] = []
         var calendarItems: [FeedItem] = []
         var poiItems: [FeedItem] = []
+        var stockItems: [FeedItem] = []
+        var tflItems: [FeedItem] = []
         var weatherNowItem: FeedItem? = nil
         var fetchFailed = false
         var wxDiagnostics: [String: String] = [:]
@@ -327,6 +390,7 @@ final class ContextOrchestrator: NSObject, ObservableObject {
             if pois.isEmpty {
                 logger.info("no points of interests found")
             }
+            // POIs are FYI-only; do not compete for the right-now winner.
             for poi in pois.prefix(2) {
                 let subtitle = poiSubtitle(for: poi)
                 let confidence = min(max(poi.confidence, 0.0), 1.0)
@@ -344,7 +408,6 @@ final class ContextOrchestrator: NSObject, ObservableObject {
                     actions: ["DISMISS"]
                 )
                 poiItems.append(item)
-                rightNowCandidates.append(.init(item: item, confidence: confidence, isEligibleForRightNow: true))
             }
         case .failure(let error):
             fetchFailed = true
@@ -385,13 +448,62 @@ final class ContextOrchestrator: NSObject, ObservableObject {
             }
         }
 
+        switch stockRes {
+        case .success(let snapshot):
+            for quote in snapshot.data.quotes.prefix(3) {
+                let item = stockQuoteToFeedItem(quote: quote, now: nowEpoch)
+                stockItems.append(item)
+            }
+            if !snapshot.data.quotes.isEmpty {
+                logger.info("stock quotes fetched count=\(snapshot.data.quotes.count)")
+            }
+        case .failure(let error):
+            logger.warning("stock fetch failed: \(String(describing: error), privacy: .public)")
+        }
+
+        var tflDiagnostics: [String: String] = [:]
+        switch tflRes {
+        case .success(let snapshot):
+            tflDiagnostics = snapshot.diagnostics
+            for disruption in snapshot.data.disruptions {
+                let confidence: Double = disruption.isMajor ? 0.9 : 0.6
+                let item = FeedItem(
+                    id: "tfl:\(disruption.lineId):\(nowEpoch / 300)",
+                    type: .transitAlert,
+                    title: tflDataSource.disruptionTitle(disruption).truncated(maxLength: TextConstraints.titleMax),
+                    subtitle: tflDataSource.disruptionSubtitle(disruption).truncated(maxLength: TextConstraints.subtitleMax),
+                    priority: confidence,
+                    ttlSec: tflDataSource.ttlSec,
+                    condition: nil,
+                    startsAt: nil,
+                    poiType: nil,
+                    bucket: disruption.isMajor ? .rightNow : .fyi,
+                    actions: ["DISMISS"]
+                )
+                tflItems.append(item)
+                if disruption.isMajor {
+                    rightNowCandidates.append(.init(item: item, confidence: confidence, isEligibleForRightNow: true))
+                }
+            }
+            if !snapshot.data.disruptions.isEmpty {
+                logger.info("tfl disruptions fetched count=\(snapshot.data.disruptions.count)")
+            }
+        case .failure(let error):
+            if case TimeoutError.timedOut = error {
+                logger.warning("tfl fetch timeout")
+            } else {
+                logger.warning("tfl fetch failed: \(String(describing: error), privacy: .public)")
+            }
+        }
+
         let elapsedMs = Int(Date().timeIntervalSince(start) * 1000)
         lastPipelineElapsedMs = elapsedMs
         lastFetchFailed = fetchFailed
         lastWeatherDiagnostics = wxDiagnostics
         lastCalendarDiagnostics = calDiagnostics
+        lastTFLDiagnostics = tflDiagnostics
 
-        logger.info("pipeline right_now_candidates=\(rightNowCandidates.count) calendar_items=\(calendarItems.count) poi_items=\(poiItems.count) fetchFailed=\(fetchFailed) elapsed_ms=\(elapsedMs)")
+        logger.info("pipeline right_now_candidates=\(rightNowCandidates.count) calendar_items=\(calendarItems.count) poi_items=\(poiItems.count) stock_items=\(stockItems.count) tfl_items=\(tflItems.count) fetchFailed=\(fetchFailed) elapsed_ms=\(elapsedMs)")
 
         if fetchFailed, rightNowCandidates.isEmpty, calendarItems.isEmpty, weatherNowItem == nil {
             let fallbackFeed = store.getFeed(now: nowEpoch)
@@ -402,10 +514,17 @@ final class ContextOrchestrator: NSObject, ObservableObject {
             return
         }
 
-        let eligibleUnsuppressed = rightNowCandidates.filter { ranked in
-            !store.isSuppressed(id: ranked.item.id, type: ranked.item.type, now: nowEpoch)
+        let poiCandidateCount = rightNowCandidates.filter { $0.item.type == .poiNearby }.count
+        if poiCandidateCount > 0 {
+            logger.warning("dropping poi candidates from right-now ranking count=\(poiCandidateCount)")
         }
 
+        let eligibleUnsuppressed = rightNowCandidates
+            .filter { $0.item.type != .poiNearby }
+            .filter { ranked in
+                !store.isSuppressed(id: ranked.item.id, type: ranked.item.type, now: nowEpoch)
+            }
+
         let winnerSelection = ranker.pickWinner(from: eligibleUnsuppressed, now: nowEpoch, context: userContext)
         let winnerItem = winnerSelection?.item ?? FeedEnvelope.allQuiet(now: nowEpoch).feed[0]
 
@@ -459,6 +578,49 @@ final class ContextOrchestrator: NSObject, ObservableObject {
             fyi.append(weatherNowItem)
         }
 
+        let fyiStocks = stockItems
+            .filter { $0.id != winnerItem.id }
+            .filter { !store.isSuppressed(id: $0.id, type: $0.type, now: nowEpoch) }
+            .prefix(3)
+
+        fyi.append(contentsOf: fyiStocks.map { item in
+            FeedItem(
+                id: item.id,
+                type: item.type,
+                title: item.title.truncated(maxLength: TextConstraints.titleMax),
+                subtitle: item.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
+                priority: min(max(item.priority, 0.0), 1.0),
+                ttlSec: max(1, item.ttlSec),
+                condition: item.condition,
+                startsAt: item.startsAt,
+                poiType: item.poiType,
+                bucket: .fyi,
+                actions: ["DISMISS"]
+            )
+        })
+
+        let fyiTFL = tflItems
+            .filter { $0.bucket == .fyi }
+            .filter { $0.id != winnerItem.id }
+            .filter { !store.isSuppressed(id: $0.id, type: $0.type, now: nowEpoch) }
+            .prefix(2)
+
+        fyi.append(contentsOf: fyiTFL.map { item in
+            FeedItem(
+                id: item.id,
+                type: item.type,
+                title: item.title.truncated(maxLength: TextConstraints.titleMax),
+                subtitle: item.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
+                priority: min(max(item.priority, 0.0), 1.0),
+                ttlSec: max(1, item.ttlSec),
+                condition: item.condition,
+                startsAt: item.startsAt,
+                poiType: item.poiType,
+                bucket: .fyi,
+                actions: ["DISMISS"]
+            )
+        })
+
         let items = [winnerItem] + fyi
         let feedEnvelope = FeedEnvelope(
             schema: 1,
@@ -500,7 +662,15 @@ final class ContextOrchestrator: NSObject, ObservableObject {
     }
 
     private func feedForGlass(base: FeedEnvelope, now: Int) -> FeedEnvelope {
-        guard let nowPlayingCard = nowPlaying?.asFeedItem(baseGeneratedAt: base.generatedAt, now: now) else {
+        let nowPlayingCard: FeedItem?
+        switch musicSource {
+        case .appleMusic:
+            nowPlayingCard = nowPlaying?.asFeedItem(baseGeneratedAt: base.generatedAt, now: now)
+        case .spotify:
+            nowPlayingCard = spotifyNowPlaying?.asFeedItem(baseGeneratedAt: base.generatedAt, now: now)
+        }
+
+        guard let nowPlayingCard else {
             return base
         }
 
@@ -532,6 +702,34 @@ final class ContextOrchestrator: NSObject, ObservableObject {
         }
         return "\(Int(meters.rounded())) m"
     }
+
+    private func stockQuoteToFeedItem(quote: StockDataSource.StockQuote, now: Int) -> FeedItem {
+        let direction = quote.change >= 0 ? "+" : ""
+        let priceStr: String
+        if quote.price >= 100000 {
+            priceStr = String(format: "%.1fK", quote.price / 1000)
+        } else if quote.price >= 1000 {
+            priceStr = String(format: "%.0f", quote.price)
+        } else {
+            priceStr = String(format: "%.2f", quote.price)
+        }
+        let title = "\(quote.symbol) $\(priceStr)"
+        let subtitle = "\(direction)\(String(format: "%.2f", quote.change)) (\(direction)\(String(format: "%.2f", quote.changePercent))%)"
+
+        return FeedItem(
+            id: "stock:\(quote.symbol):\(now / 300)",
+            type: .stock,
+            title: title.truncated(maxLength: TextConstraints.titleMax),
+            subtitle: subtitle.truncated(maxLength: TextConstraints.subtitleMax),
+            priority: 0.3,
+            ttlSec: 600,
+            condition: nil,
+            startsAt: nil,
+            poiType: nil,
+            bucket: .fyi,
+            actions: ["DISMISS"]
+        )
+    }
 }
 
 extension ContextOrchestrator: CLLocationManagerDelegate {

IrisCompanion/iris/Spotify/KeychainHelper.swift

@@ -0,0 +1,61 @@
+//
+//  KeychainHelper.swift
+//  iris
+//
+//  Secure token storage using iOS Keychain.
+//
+
+import Foundation
+import Security
+
+enum KeychainHelper {
+    private static let service = "sh.nym.iris.spotify"
+
+    static func save(key: String, data: Data) throws {
+        let query: [String: Any] = [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecAttrService as String: service,
+            kSecAttrAccount as String: key
+        ]
+        SecItemDelete(query as CFDictionary)
+
+        let attributes: [String: Any] = [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecAttrService as String: service,
+            kSecAttrAccount as String: key,
+            kSecValueData as String: data,
+            kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock
+        ]
+        let status = SecItemAdd(attributes as CFDictionary, nil)
+        guard status == errSecSuccess else {
+            throw KeychainError.saveFailed(status)
+        }
+    }
+
+    static func load(key: String) -> Data? {
+        let query: [String: Any] = [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecAttrService as String: service,
+            kSecAttrAccount as String: key,
+            kSecReturnData as String: true,
+            kSecMatchLimit as String: kSecMatchLimitOne
+        ]
+        var result: AnyObject?
+        let status = SecItemCopyMatching(query as CFDictionary, &result)
+        guard status == errSecSuccess else { return nil }
+        return result as? Data
+    }
+
+    static func delete(key: String) {
+        let query: [String: Any] = [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecAttrService as String: service,
+            kSecAttrAccount as String: key
+        ]
+        SecItemDelete(query as CFDictionary)
+    }
+
+    enum KeychainError: Error {
+        case saveFailed(OSStatus)
+    }
+}

IrisCompanion/iris/Spotify/SpotifyAPIClient.swift

@@ -0,0 +1,77 @@
+//
+//  SpotifyAPIClient.swift
+//  iris
+//
+//  Spotify Web API client for fetching currently playing track.
+//
+
+import Foundation
+import os
+
+@available(iOS 16.0, *)
+@MainActor
+final class SpotifyAPIClient {
+    private let authManager: SpotifyAuthManager
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "iris", category: "SpotifyAPI")
+    private let baseUrl = "https://api.spotify.com/v1"
+
+    init(authManager: SpotifyAuthManager) {
+        self.authManager = authManager
+    }
+
+    func getCurrentPlayback() async throws -> SpotifyPlaybackState? {
+        try await getCurrentPlayback(isRetry: false)
+    }
+
+    private func getCurrentPlayback(isRetry: Bool) async throws -> SpotifyPlaybackState? {
+        let refreshed = await authManager.refreshTokenIfNeeded()
+        guard refreshed else {
+            throw SpotifyAPIError.notAuthenticated
+        }
+
+        guard let token = authManager.accessToken else {
+            throw SpotifyAPIError.notAuthenticated
+        }
+
+        var request = URLRequest(url: URL(string: "\(baseUrl)/me/player/currently-playing")!)
+        request.httpMethod = "GET"
+        request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
+
+        let (data, response) = try await URLSession.shared.data(for: request)
+
+        guard let httpResponse = response as? HTTPURLResponse else {
+            throw SpotifyAPIError.invalidResponse
+        }
+
+        switch httpResponse.statusCode {
+        case 200:
+            return try JSONDecoder().decode(SpotifyPlaybackState.self, from: data)
+        case 204:
+            return nil
+        case 401:
+            guard !isRetry else {
+                throw SpotifyAPIError.tokenExpired
+            }
+            let refreshed = await authManager.refreshTokenIfNeeded()
+            if refreshed {
+                return try await getCurrentPlayback(isRetry: true)
+            }
+            throw SpotifyAPIError.tokenExpired
+        case 429:
+            let retryAfter = httpResponse.value(forHTTPHeaderField: "Retry-After")
+            logger.warning("Rate limited, retry after: \(retryAfter ?? "unknown")")
+            throw SpotifyAPIError.rateLimited
+        default:
+            logger.error("API error: \(httpResponse.statusCode)")
+            throw SpotifyAPIError.apiError(httpResponse.statusCode)
+        }
+    }
+
+    enum SpotifyAPIError: Error {
+        case notAuthenticated
+        case tokenExpired
+        case invalidResponse
+        case rateLimited
+        case apiError(Int)
+    }
+}

IrisCompanion/iris/Spotify/SpotifyAuthManager.swift

@@ -0,0 +1,276 @@
+//
+//  SpotifyAuthManager.swift
+//  iris
+//
+//  OAuth 2.0 PKCE authentication for Spotify Web API.
+//
+
+import AuthenticationServices
+import CommonCrypto
+import Foundation
+import os
+
+enum SpotifyConfig {
+    static let redirectUri = "iris-spotify-auth://callback"
+    static let scopes = "user-read-playback-state user-read-currently-playing"
+    static let authUrl = "https://accounts.spotify.com/authorize"
+    static let tokenUrl = "https://accounts.spotify.com/api/token"
+}
+
+@available(iOS 16.0, *)
+@MainActor
+final class SpotifyAuthManager: NSObject, ObservableObject {
+    @Published private(set) var isConnected: Bool = false
+    @Published private(set) var isAuthenticating: Bool = false
+    @Published private(set) var error: String? = nil
+    @Published private(set) var clientId: String = ""
+
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "iris", category: "SpotifyAuth")
+    private let tokensKey = "spotify_tokens"
+    private let clientIdKey = "spotify_client_id"
+    private var codeVerifier: String? = nil
+    private var authSession: ASWebAuthenticationSession? = nil
+
+    var isConfigured: Bool {
+        !clientId.isEmpty
+    }
+
+    override init() {
+        super.init()
+        clientId = UserDefaults.standard.string(forKey: clientIdKey) ?? ""
+        loadTokens()
+    }
+
+    func setClientId(_ id: String) {
+        let trimmed = id.trimmingCharacters(in: .whitespacesAndNewlines)
+        clientId = trimmed
+        UserDefaults.standard.set(trimmed, forKey: clientIdKey)
+        logger.info("Spotify Client ID updated")
+    }
+
+    var accessToken: String? {
+        loadStoredTokens()?.accessToken
+    }
+
+    func startAuth() {
+        guard !isAuthenticating else { return }
+        isAuthenticating = true
+        error = nil
+
+        let verifier = generateCodeVerifier()
+        codeVerifier = verifier
+        let challenge = generateCodeChallenge(verifier: verifier)
+
+        var components = URLComponents(string: SpotifyConfig.authUrl)!
+        components.queryItems = [
+            URLQueryItem(name: "client_id", value: clientId),
+            URLQueryItem(name: "response_type", value: "code"),
+            URLQueryItem(name: "redirect_uri", value: SpotifyConfig.redirectUri),
+            URLQueryItem(name: "scope", value: SpotifyConfig.scopes),
+            URLQueryItem(name: "code_challenge_method", value: "S256"),
+            URLQueryItem(name: "code_challenge", value: challenge)
+        ]
+
+        guard let authUrl = components.url else {
+            error = "Failed to build auth URL"
+            isAuthenticating = false
+            return
+        }
+
+        let session = ASWebAuthenticationSession(
+            url: authUrl,
+            callbackURLScheme: "iris-spotify-auth"
+        ) { [weak self] callbackUrl, authError in
+            Task { @MainActor in
+                self?.handleAuthCallback(callbackUrl: callbackUrl, error: authError)
+            }
+        }
+        session.presentationContextProvider = self
+        session.prefersEphemeralWebBrowserSession = false
+        authSession = session
+
+        if !session.start() {
+            error = "Failed to start auth session"
+            isAuthenticating = false
+        }
+    }
+
+    func handleCallback(url: URL) {
+        guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+              let code = components.queryItems?.first(where: { $0.name == "code" })?.value else {
+            error = "Invalid callback URL"
+            isAuthenticating = false
+            return
+        }
+
+        Task {
+            await exchangeCodeForTokens(code: code)
+        }
+    }
+
+    func disconnect() {
+        KeychainHelper.delete(key: tokensKey)
+        isConnected = false
+        logger.info("Disconnected from Spotify")
+    }
+
+    func refreshTokenIfNeeded() async -> Bool {
+        guard let tokens = loadStoredTokens() else { return false }
+
+        if !tokens.expiresWithinMinutes {
+            return true
+        }
+
+        return await refreshToken(refreshToken: tokens.refreshToken)
+    }
+
+    private func handleAuthCallback(callbackUrl: URL?, error authError: Error?) {
+        isAuthenticating = false
+        authSession = nil
+
+        if let authError = authError as? ASWebAuthenticationSessionError,
+           authError.code == .canceledLogin {
+            logger.info("User cancelled Spotify login")
+            return
+        }
+
+        if let authError {
+            error = authError.localizedDescription
+            return
+        }
+
+        guard let callbackUrl else {
+            error = "No callback URL received"
+            return
+        }
+
+        handleCallback(url: callbackUrl)
+    }
+
+    private func exchangeCodeForTokens(code: String) async {
+        guard let verifier = codeVerifier else {
+            error = "Missing code verifier"
+            isAuthenticating = false
+            return
+        }
+
+        let body = [
+            "grant_type": "authorization_code",
+            "code": code,
+            "redirect_uri": SpotifyConfig.redirectUri,
+            "client_id": clientId,
+            "code_verifier": verifier
+        ]
+
+        do {
+            let tokenResponse = try await postTokenRequest(body: body)
+            let tokens = SpotifyTokens(
+                accessToken: tokenResponse.accessToken,
+                refreshToken: tokenResponse.refreshToken ?? "",
+                expiresAt: Date().addingTimeInterval(TimeInterval(tokenResponse.expiresIn))
+            )
+            try saveTokens(tokens)
+            isConnected = true
+            logger.info("Successfully authenticated with Spotify")
+        } catch {
+            self.error = "Token exchange failed: \(error.localizedDescription)"
+            logger.error("Token exchange failed: \(error.localizedDescription)")
+        }
+
+        codeVerifier = nil
+        isAuthenticating = false
+    }
+
+    private func refreshToken(refreshToken: String) async -> Bool {
+        let body = [
+            "grant_type": "refresh_token",
+            "refresh_token": refreshToken,
+            "client_id": clientId
+        ]
+
+        do {
+            let tokenResponse = try await postTokenRequest(body: body)
+            let newRefreshToken = tokenResponse.refreshToken ?? refreshToken
+            let tokens = SpotifyTokens(
+                accessToken: tokenResponse.accessToken,
+                refreshToken: newRefreshToken,
+                expiresAt: Date().addingTimeInterval(TimeInterval(tokenResponse.expiresIn))
+            )
+            try saveTokens(tokens)
+            logger.info("Refreshed Spotify token")
+            return true
+        } catch {
+            logger.error("Token refresh failed: \(error.localizedDescription)")
+            return false
+        }
+    }
+
+    private func postTokenRequest(body: [String: String]) async throws -> SpotifyTokenResponse {
+        var request = URLRequest(url: URL(string: SpotifyConfig.tokenUrl)!)
+        request.httpMethod = "POST"
+        request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
+
+        let bodyString = body.map { "\($0.key)=\($0.value.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? $0.value)" }
+            .joined(separator: "&")
+        request.httpBody = bodyString.data(using: .utf8)
+
+        let (data, response) = try await URLSession.shared.data(for: request)
+
+        guard let httpResponse = response as? HTTPURLResponse,
+              httpResponse.statusCode == 200 else {
+            let statusCode = (response as? HTTPURLResponse)?.statusCode ?? -1
+            throw SpotifyAuthError.tokenRequestFailed(statusCode)
+        }
+
+        return try JSONDecoder().decode(SpotifyTokenResponse.self, from: data)
+    }
+
+    private func loadTokens() {
+        isConnected = loadStoredTokens() != nil
+    }
+
+    private func loadStoredTokens() -> SpotifyTokens? {
+        guard let data = KeychainHelper.load(key: tokensKey) else { return nil }
+        return try? JSONDecoder().decode(SpotifyTokens.self, from: data)
+    }
+
+    private func saveTokens(_ tokens: SpotifyTokens) throws {
+        let data = try JSONEncoder().encode(tokens)
+        try KeychainHelper.save(key: tokensKey, data: data)
+    }
+
+    private func generateCodeVerifier() -> String {
+        var bytes = [UInt8](repeating: 0, count: 32)
+        _ = SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes)
+        return Data(bytes).base64URLEncodedString()
+    }
+
+    private func generateCodeChallenge(verifier: String) -> String {
+        guard let data = verifier.data(using: .utf8) else { return "" }
+        var hash = [UInt8](repeating: 0, count: Int(CC_SHA256_DIGEST_LENGTH))
+        data.withUnsafeBytes { buffer in
+            _ = CC_SHA256(buffer.baseAddress, CC_LONG(data.count), &hash)
+        }
+        return Data(hash).base64URLEncodedString()
+    }
+
+    enum SpotifyAuthError: Error {
+        case tokenRequestFailed(Int)
+    }
+}
+
+@available(iOS 16.0, *)
+extension SpotifyAuthManager: ASWebAuthenticationPresentationContextProviding {
+    nonisolated func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
+        ASPresentationAnchor()
+    }
+}
+
+extension Data {
+    func base64URLEncodedString() -> String {
+        base64EncodedString()
+            .replacingOccurrences(of: "+", with: "-")
+            .replacingOccurrences(of: "/", with: "_")
+            .replacingOccurrences(of: "=", with: "")
+    }
+}

IrisCompanion/iris/Spotify/SpotifyModels.swift

@@ -0,0 +1,91 @@
+//
+//  SpotifyModels.swift
+//  iris
+//
+//  Codable models for Spotify Web API responses.
+//
+
+import Foundation
+
+struct SpotifyTokens: Codable {
+    let accessToken: String
+    let refreshToken: String
+    let expiresAt: Date
+
+    enum CodingKeys: String, CodingKey {
+        case accessToken = "access_token"
+        case refreshToken = "refresh_token"
+        case expiresAt = "expires_at"
+    }
+
+    var isExpired: Bool {
+        Date() >= expiresAt
+    }
+
+    var expiresWithinMinutes: Bool {
+        Date().addingTimeInterval(5 * 60) >= expiresAt
+    }
+}
+
+struct SpotifyTokenResponse: Codable {
+    let accessToken: String
+    let tokenType: String
+    let expiresIn: Int
+    let refreshToken: String?
+    let scope: String?
+
+    enum CodingKeys: String, CodingKey {
+        case accessToken = "access_token"
+        case tokenType = "token_type"
+        case expiresIn = "expires_in"
+        case refreshToken = "refresh_token"
+        case scope
+    }
+}
+
+struct SpotifyPlaybackState: Codable {
+    let isPlaying: Bool
+    let progressMs: Int?
+    let item: SpotifyTrack?
+
+    enum CodingKeys: String, CodingKey {
+        case isPlaying = "is_playing"
+        case progressMs = "progress_ms"
+        case item
+    }
+}
+
+struct SpotifyTrack: Codable {
+    let id: String
+    let name: String
+    let artists: [SpotifyArtist]
+    let album: SpotifyAlbum
+    let durationMs: Int
+
+    enum CodingKeys: String, CodingKey {
+        case id, name, artists, album
+        case durationMs = "duration_ms"
+    }
+}
+
+struct SpotifyArtist: Codable {
+    let id: String
+    let name: String
+}
+
+struct SpotifyAlbum: Codable {
+    let id: String
+    let name: String
+}
+
+enum MusicSource: String, CaseIterable, Codable {
+    case appleMusic = "apple_music"
+    case spotify = "spotify"
+
+    var displayName: String {
+        switch self {
+        case .appleMusic: return "Apple Music"
+        case .spotify: return "Spotify"
+        }
+    }
+}

IrisCompanion/iris/Spotify/SpotifyNowPlayingMonitor.swift

@@ -0,0 +1,145 @@
+//
+//  SpotifyNowPlayingMonitor.swift
+//  iris
+//
+//  Polling monitor for Spotify currently playing track.
+//
+
+import Foundation
+import os
+
+@available(iOS 16.0, *)
+struct SpotifyNowPlaying: Equatable, Sendable {
+    let itemId: String
+    let title: String
+    let artist: String?
+    let album: String?
+    let isPlaying: Bool
+
+    func asFeedItem(baseGeneratedAt: Int, now: Int) -> FeedItem {
+        let desiredLifetimeSec = 30
+        let ttl = max(1, (now - baseGeneratedAt) + desiredLifetimeSec)
+
+        let subtitleParts = [artist, album]
+            .compactMap { $0?.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+        let subtitle = subtitleParts.isEmpty ? "Spotify" : subtitleParts.joined(separator: " • ")
+
+        return FeedItem(
+            id: "spotify:now:\(itemId)",
+            type: .nowPlaying,
+            title: title.truncated(maxLength: TextConstraints.titleMax),
+            subtitle: subtitle.truncated(maxLength: TextConstraints.subtitleMax),
+            priority: isPlaying ? 0.35 : 0.2,
+            ttlSec: ttl,
+            condition: nil,
+            startsAt: nil,
+            bucket: .fyi,
+            actions: ["DISMISS"]
+        )
+    }
+}
+
+@available(iOS 16.0, *)
+@MainActor
+final class SpotifyNowPlayingMonitor {
+    struct Update: Sendable {
+        let isConnected: Bool
+        let snapshot: SpotifyNowPlaying?
+    }
+
+    var onUpdate: ((Update) -> Void)? = nil
+
+    private let authManager: SpotifyAuthManager
+    private let apiClient: SpotifyAPIClient
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "iris", category: "SpotifyNowPlaying")
+
+    private var pollTimer: DispatchSourceTimer?
+    private var isRunning = false
+    private var lastSnapshot: SpotifyNowPlaying? = nil
+
+    init(authManager: SpotifyAuthManager) {
+        self.authManager = authManager
+        self.apiClient = SpotifyAPIClient(authManager: authManager)
+    }
+
+    func start() {
+        guard !isRunning else { return }
+        isRunning = true
+        logger.info("Spotify monitor started")
+        startPolling()
+
+        Task { @MainActor in
+            await refresh(reason: "start")
+        }
+    }
+
+    func stop() {
+        guard isRunning else { return }
+        isRunning = false
+        logger.info("Spotify monitor stopped")
+
+        pollTimer?.cancel()
+        pollTimer = nil
+    }
+
+    private func startPolling() {
+        guard pollTimer == nil else { return }
+        let timer = DispatchSource.makeTimerSource(queue: .main)
+        timer.schedule(deadline: .now() + 4, repeating: 4)
+        timer.setEventHandler { [weak self] in
+            guard let self else { return }
+            Task { @MainActor in
+                await self.refresh(reason: "poll")
+            }
+        }
+        timer.resume()
+        pollTimer = timer
+    }
+
+    private func refresh(reason: String) async {
+        guard authManager.isConnected else {
+            if lastSnapshot != nil {
+                lastSnapshot = nil
+                onUpdate?(Update(isConnected: false, snapshot: nil))
+            }
+            return
+        }
+
+        do {
+            let playback = try await apiClient.getCurrentPlayback()
+
+            guard let track = playback?.item, playback?.isPlaying == true else {
+                if lastSnapshot != nil {
+                    lastSnapshot = nil
+                    onUpdate?(Update(isConnected: true, snapshot: nil))
+                }
+                return
+            }
+
+            let artistName = track.artists.first?.name
+            let snapshot = SpotifyNowPlaying(
+                itemId: track.id,
+                title: track.name,
+                artist: artistName,
+                album: track.album.name,
+                isPlaying: playback?.isPlaying ?? false
+            )
+
+            guard snapshot != lastSnapshot else { return }
+            lastSnapshot = snapshot
+            onUpdate?(Update(isConnected: true, snapshot: snapshot))
+            logger.debug("Spotify now playing: \(snapshot.title)")
+
+        } catch SpotifyAPIClient.SpotifyAPIError.notAuthenticated {
+            if lastSnapshot != nil {
+                lastSnapshot = nil
+                onUpdate?(Update(isConnected: false, snapshot: nil))
+            }
+        } catch SpotifyAPIClient.SpotifyAPIError.rateLimited {
+            logger.warning("Spotify rate limited, skipping this poll")
+        } catch {
+            logger.error("Spotify fetch error: \(error.localizedDescription)")
+        }
+    }
+}

IrisCompanion/iris/Views/OrchestratorView.swift

@@ -45,7 +45,7 @@ struct OrchestratorView: View {
                     Button("Recompute Now") { orchestrator.recomputeNow() }
                 }
 
-                Section("Feed") {
+                Section("Winner") {
                     if let feed = orchestrator.lastFeed, let winner = feed.winnerItem() {
                         Text(winner.title)
                             .font(.headline)
@@ -54,36 +54,56 @@ struct OrchestratorView: View {
                                 .font(.subheadline)
                                 .foregroundStyle(.secondary)
                         }
-                        Text("type \(winner.type.rawValue) • prio \(String(format: "%.2f", winner.priority)) • ttl \(winner.ttlSec)s")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-
-                        if feed.feed.count > 1 {
-                            Divider()
+                        LabeledContent("Type") { Text(winner.type.rawValue) }
+                        LabeledContent("Bucket") { Text(winner.bucket.rawValue) }
+                        LabeledContent("Priority") { Text(String(format: "%.2f", winner.priority)) }
+                        LabeledContent("TTL") { Text("\(winner.ttlSec)s") }
+                        if let poiType = winner.poiType {
+                            LabeledContent("POI type") { Text(poiType.rawValue) }
                         }
+                        if let startsAt = winner.startsAt {
+                            LabeledContent("Starts at") { Text("\(startsAt)") }
+                        }
+                        LabeledContent("ID") {
+                            Text(winner.id)
+                                .font(.caption)
+                                .textSelection(.enabled)
+                        }
+                    } else {
+                        Text("No winner yet")
+                            .foregroundStyle(.secondary)
+                    }
+                }
 
-                        ForEach(feed.feed, id: \.id) { item in
-                            VStack(alignment: .leading, spacing: 6) {
-                                HStack {
-                                    Text(item.title)
-                                        .font(.headline)
-                                        .lineLimit(1)
-                                    Spacer()
-                                    Text(item.type.rawValue)
+                Section("Feed") {
+                    if let feed = orchestrator.lastFeed {
+                        if feed.feed.isEmpty {
+                            Text("No feed items yet")
+                                .foregroundStyle(.secondary)
+                        } else {
+                            ForEach(feed.feed, id: \.id) { item in
+                                VStack(alignment: .leading, spacing: 6) {
+                                    HStack {
+                                        Text(item.title)
+                                            .font(.headline)
+                                            .lineLimit(1)
+                                        Spacer()
+                                        Text(item.type.rawValue)
+                                            .font(.caption)
+                                            .foregroundStyle(.secondary)
+                                    }
+                                    if !item.subtitle.isEmpty {
+                                        Text(item.subtitle)
+                                            .font(.subheadline)
+                                            .foregroundStyle(.secondary)
+                                            .lineLimit(1)
+                                    }
+                                    Text("bucket \(item.bucket.rawValue) • prio \(String(format: "%.2f", item.priority)) • ttl \(item.ttlSec)s")
                                         .font(.caption)
                                         .foregroundStyle(.secondary)
                                 }
-                                if !item.subtitle.isEmpty {
-                                    Text(item.subtitle)
-                                        .font(.subheadline)
-                                        .foregroundStyle(.secondary)
-                                        .lineLimit(1)
-                                }
-                                Text("bucket \(item.bucket.rawValue) • prio \(String(format: "%.2f", item.priority)) • ttl \(item.ttlSec)s")
-                                    .font(.caption)
-                                    .foregroundStyle(.secondary)
+                                .padding(.vertical, 4)
                             }
-                            .padding(.vertical, 4)
                         }
                     } else {
                         Text("No feed yet")

IrisCompanion/iris/Views/SettingsView.swift

@@ -0,0 +1,177 @@
+//
+//  SettingsView.swift
+//  iris
+//
+//  Settings UI for music source selection and Spotify connection.
+//
+
+import MusicKit
+import SwiftUI
+
+@available(iOS 16.0, *)
+struct SettingsView: View {
+    @EnvironmentObject private var orchestrator: ContextOrchestrator
+    @EnvironmentObject private var spotifyAuth: SpotifyAuthManager
+    @State private var isConfigExpanded: Bool = false
+    @State private var clientIdInput: String = ""
+
+    var body: some View {
+        NavigationStack {
+            List {
+                Section("Music Source") {
+                    Picker("Source", selection: Binding(
+                        get: { orchestrator.musicSource },
+                        set: { newValue in
+                            if newValue == .spotify && !spotifyAuth.isConnected {
+                                return
+                            }
+                            orchestrator.musicSource = newValue
+                        }
+                    )) {
+                        ForEach(MusicSource.allCases, id: \.self) { source in
+                            Text(source.displayName).tag(source)
+                        }
+                    }
+                    .pickerStyle(.segmented)
+
+                    if !spotifyAuth.isConnected {
+                        Text("Connect Spotify below to enable it as a source")
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+                    }
+                }
+
+                Section {
+                    DisclosureGroup("Configuration", isExpanded: $isConfigExpanded) {
+                        TextField("Client ID", text: $clientIdInput)
+                            .textInputAutocapitalization(.never)
+                            .autocorrectionDisabled()
+                            .font(.system(.body, design: .monospaced))
+
+                        Text("Get your Client ID from developer.spotify.com/dashboard")
+                            .font(.caption)
+                            .foregroundStyle(.secondary)
+
+                        Button("Save") {
+                            spotifyAuth.setClientId(clientIdInput)
+                            isConfigExpanded = false
+                        }
+                        .disabled(clientIdInput.trimmingCharacters(in: .whitespaces).isEmpty)
+                    }
+                    .onAppear {
+                        clientIdInput = spotifyAuth.clientId
+                    }
+
+                    if spotifyAuth.isConnected {
+                        HStack {
+                            Label("Connected", systemImage: "checkmark.circle.fill")
+                                .foregroundColor(.green)
+                            Spacer()
+                        }
+                        Button("Disconnect", role: .destructive) {
+                            spotifyAuth.disconnect()
+                            if orchestrator.musicSource == .spotify {
+                                orchestrator.musicSource = .appleMusic
+                            }
+                        }
+                    } else if spotifyAuth.isConfigured {
+                        Button {
+                            spotifyAuth.startAuth()
+                        } label: {
+                            HStack {
+                                Label("Connect to Spotify", systemImage: "link")
+                                Spacer()
+                                if spotifyAuth.isAuthenticating {
+                                    ProgressView()
+                                }
+                            }
+                        }
+                        .disabled(spotifyAuth.isAuthenticating)
+                    } else {
+                        Text("Enter your Client ID above to connect")
+                            .font(.callout)
+                            .foregroundStyle(.secondary)
+                    }
+
+                    if let error = spotifyAuth.error {
+                        Text(error)
+                            .font(.caption)
+                            .foregroundColor(.red)
+                    }
+                } header: {
+                    Text("Spotify")
+                } footer: {
+                    if !spotifyAuth.isConnected && spotifyAuth.isConfigured {
+                        Text("Connect your Spotify account to display current track on Glass.")
+                    }
+                }
+
+                Section {
+                    HStack {
+                        Text("Authorization")
+                        Spacer()
+                        Text(authStatusText(orchestrator.musicAuthorization))
+                            .foregroundStyle(.secondary)
+                    }
+                } header: {
+                    Text("Apple Music")
+                }
+
+                Section {
+                    if let nowPlayingInfo = currentNowPlaying {
+                        VStack(alignment: .leading, spacing: 4) {
+                            Text(nowPlayingInfo.title)
+                                .font(.headline)
+                            if let artist = nowPlayingInfo.artist {
+                                Text(artist)
+                                    .font(.subheadline)
+                                    .foregroundStyle(.secondary)
+                            }
+                        }
+                    } else {
+                        Text("Nothing playing")
+                            .foregroundStyle(.secondary)
+                    }
+                } header: {
+                    Text("Now Playing")
+                } footer: {
+                    Text("Source: \(orchestrator.musicSource.displayName)")
+                }
+            }
+            .navigationTitle("Settings")
+        }
+    }
+
+    private var currentNowPlaying: (title: String, artist: String?)? {
+        switch orchestrator.musicSource {
+        case .appleMusic:
+            guard let np = orchestrator.nowPlaying else { return nil }
+            return (np.title, np.artist)
+        case .spotify:
+            guard let np = orchestrator.spotifyNowPlaying else { return nil }
+            return (np.title, np.artist)
+        }
+    }
+
+    private func authStatusText(_ status: MusicAuthorization.Status) -> String {
+        switch status {
+        case .notDetermined: return "Not Determined"
+        case .denied: return "Denied"
+        case .restricted: return "Restricted"
+        case .authorized: return "Authorized"
+        @unknown default: return "Unknown"
+        }
+    }
+}
+
+@available(iOS 16.0, *)
+struct SettingsView_Previews: PreviewProvider {
+    static var previews: some View {
+        let ble = BlePeripheralManager()
+        let spotifyAuth = SpotifyAuthManager()
+        let orchestrator = ContextOrchestrator(ble: ble, spotifyAuth: spotifyAuth)
+        SettingsView()
+            .environmentObject(orchestrator)
+            .environmentObject(spotifyAuth)
+    }
+}

IrisCompanion/iris/Views/StockSettingsView.swift

@@ -0,0 +1,104 @@
+//
+//  StockSettingsView.swift
+//  iris
+//
+
+import SwiftUI
+
+struct StockSettingsView: View {
+    @ObservedObject var store: StockSettingsStore
+    @State private var newSymbol: String = ""
+    @State private var showError: Bool = false
+    @State private var errorMessage: String = ""
+
+    var body: some View {
+        Form {
+            Section {
+                ForEach(store.symbols, id: \.self) { symbol in
+                    HStack {
+                        Text(symbol)
+                            .font(.body.monospaced())
+                        Spacer()
+                        Button(role: .destructive) {
+                            store.removeSymbol(symbol)
+                        } label: {
+                            Image(systemName: "trash")
+                                .foregroundStyle(.red)
+                        }
+                        .buttonStyle(.plain)
+                    }
+                }
+                .onDelete { indexSet in
+                    for index in indexSet {
+                        store.removeSymbol(store.symbols[index])
+                    }
+                }
+
+                if store.symbols.count < 5 {
+                    HStack {
+                        TextField("Symbol (e.g. AAPL)", text: $newSymbol)
+                            .textInputAutocapitalization(.characters)
+                            .autocorrectionDisabled()
+                            .font(.body.monospaced())
+                        Button("Add") {
+                            addSymbol()
+                        }
+                        .disabled(newSymbol.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
+                    }
+                }
+            } header: {
+                Text("Stock Symbols")
+            } footer: {
+                Text("Enter up to 5 stock symbols. Cards appear in the FYI section.")
+            }
+
+            Section {
+                VStack(alignment: .leading, spacing: 8) {
+                    Text("Examples:")
+                        .font(.subheadline.bold())
+                    Text("AAPL - Apple Inc.")
+                    Text("GOOGL - Alphabet Inc.")
+                    Text("^GSPC - S&P 500 Index")
+                    Text("^DJI - Dow Jones")
+                    Text("^IXIC - NASDAQ Composite")
+                }
+                .font(.caption)
+                .foregroundStyle(.secondary)
+            }
+        }
+        .navigationTitle("Stocks")
+        .alert("Error", isPresented: $showError) {
+            Button("OK") {}
+        } message: {
+            Text(errorMessage)
+        }
+    }
+
+    private func addSymbol() {
+        let cleaned = newSymbol.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
+        guard !cleaned.isEmpty else { return }
+
+        if store.symbols.contains(cleaned) {
+            errorMessage = "Symbol '\(cleaned)' already exists."
+            showError = true
+            return
+        }
+
+        if store.symbols.count >= 5 {
+            errorMessage = "Maximum of 5 symbols allowed."
+            showError = true
+            return
+        }
+
+        store.addSymbol(cleaned)
+        newSymbol = ""
+    }
+}
+
+struct StockSettingsView_Previews: PreviewProvider {
+    static var previews: some View {
+        NavigationStack {
+            StockSettingsView(store: StockSettingsStore())
+        }
+    }
+}

IrisCompanion/iris/irisApp.swift

@@ -12,12 +12,15 @@ struct irisApp: App {
     @Environment(\.scenePhase) private var scenePhase
     @StateObject private var ble: BlePeripheralManager
     @StateObject private var orchestrator: ContextOrchestrator
+    @StateObject private var spotifyAuth: SpotifyAuthManager
 
     init() {
         let bleManager = BlePeripheralManager()
         bleManager.start()
+        let spotify = SpotifyAuthManager()
         _ble = StateObject(wrappedValue: bleManager)
-        _orchestrator = StateObject(wrappedValue: ContextOrchestrator(ble: bleManager))
+        _spotifyAuth = StateObject(wrappedValue: spotify)
+        _orchestrator = StateObject(wrappedValue: ContextOrchestrator(ble: bleManager, spotifyAuth: spotify))
     }
 
     var body: some Scene {
@@ -25,6 +28,12 @@ struct irisApp: App {
             ContentView()
                 .environmentObject(ble)
                 .environmentObject(orchestrator)
+                .environmentObject(spotifyAuth)
+                .onOpenURL { url in
+                    if url.scheme == "iris-spotify-auth" {
+                        spotifyAuth.handleCallback(url: url)
+                    }
+                }
                 .onChange(of: scenePhase) { phase in
                     if phase == .active || phase == .background {
                         ble.start()