Skip to content

A tiny friend in your Mac's notch and on your iPhone that keeps an eye on your AI coding agents: Claude Code, Codex, Cursor, Gemini CLI, Antigravity and more. Approve from the notch or your Lock Screen.

Portfolio: 16 networks, sparklines, 24h change; DeepSeek/Qwen/Moonshot chat; UI polish

Louis Railleafbaea47156c
diff --git a/NotchBuddy/Resources/Localizable.xcstrings b/NotchBuddy/Resources/Localizable.xcstrings
index 05549806..fb31af76 100644
--- a/NotchBuddy/Resources/Localizable.xcstrings
+++ b/NotchBuddy/Resources/Localizable.xcstrings
@@ -518,6 +518,9 @@
}
}
}
+ },
+ "Address" : {
+
},
"Advertisement" : {
"localizations" : {
@@ -14942,10 +14945,30 @@
},
"portfolio.testing" : {
"localizations" : {
- "en" : { "stringUnit" : { "state" : "translated", "value" : "Testing…" } },
- "fr" : { "stringUnit" : { "state" : "translated", "value" : "Test en cours…" } },
- "de" : { "stringUnit" : { "state" : "translated", "value" : "Wird getestet…" } },
- "es" : { "stringUnit" : { "state" : "translated", "value" : "Probando…" } }
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Wird getestet…"
+ }
+ },
+ "en" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Testing…"
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Probando…"
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Test en cours…"
+ }
+ }
}
},
"portfolio.verify-save" : {
diff --git a/NotchBuddy/Sources/App/AppState.swift b/NotchBuddy/Sources/App/AppState.swift
index be3c7627..e95c65b1 100644
--- a/NotchBuddy/Sources/App/AppState.swift
+++ b/NotchBuddy/Sources/App/AppState.swift
@@ -136,6 +136,15 @@ final class AppState: ObservableObject {
@Published var lmstudioChatModel: String = ChatProvider.lmstudio.defaultModel {
didSet { UserDefaults.standard.set(lmstudioChatModel, forKey: "lmstudioChatModel") }
}
+ @Published var deepseekChatModel: String = ChatProvider.deepseek.defaultModel {
+ didSet { UserDefaults.standard.set(deepseekChatModel, forKey: "deepseekChatModel") }
+ }
+ @Published var qwenChatModel: String = ChatProvider.qwen.defaultModel {
+ didSet { UserDefaults.standard.set(qwenChatModel, forKey: "qwenChatModel") }
+ }
+ @Published var moonshotChatModel: String = ChatProvider.moonshot.defaultModel {
+ didSet { UserDefaults.standard.set(moonshotChatModel, forKey: "moonshotChatModel") }
+ }
@Published var ollamaServerURL: String = "" {
didSet { UserDefaults.standard.set(ollamaServerURL, forKey: "ollamaServerURL") }
}
@@ -205,6 +214,9 @@ final class AppState: ObservableObject {
case .anthropic: models = await ClaudeService.fetchModels(apiKey: apiKey)
case .google: models = await ClaudeService.fetchGoogleModels(apiKey: apiKey)
case .openai: models = await ClaudeService.fetchOpenAIModels(apiKey: apiKey)
+ case .deepseek: models = await ClaudeService.fetchOpenAICompatibleModels(baseURL: "https://api.deepseek.com/v1", apiKey: apiKey)
+ case .qwen: models = await ClaudeService.fetchOpenAICompatibleModels(baseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1", apiKey: apiKey)
+ case .moonshot: models = await ClaudeService.fetchOpenAICompatibleModels(baseURL: "https://api.moonshot.cn/v1", apiKey: apiKey)
case .ollama, .lmstudio: models = [] // handled above
}
loadingProviderModels.remove(provider)
@@ -225,6 +237,18 @@ final class AppState: ObservableObject {
if !models.contains(where: { $0.id == openAIChatModel }) {
openAIChatModel = models.first(where: { $0.id.contains("mini") })?.id ?? models.first!.id
}
+ case .deepseek:
+ if !models.contains(where: { $0.id == deepseekChatModel }) {
+ deepseekChatModel = models.first!.id
+ }
+ case .qwen:
+ if !models.contains(where: { $0.id == qwenChatModel }) {
+ qwenChatModel = models.first!.id
+ }
+ case .moonshot:
+ if !models.contains(where: { $0.id == moonshotChatModel }) {
+ moonshotChatModel = models.first!.id
+ }
case .ollama, .lmstudio: break
}
}
@@ -239,6 +263,9 @@ final class AppState: ObservableObject {
case .openai: return openAIChatModel
case .ollama: return ollamaChatModel
case .lmstudio: return lmstudioChatModel
+ case .deepseek: return deepseekChatModel
+ case .qwen: return qwenChatModel
+ case .moonshot: return moonshotChatModel
}
}
@@ -504,6 +531,9 @@ final class AppState: ObservableObject {
if let v = ud.string(forKey: "openAIChatModel"), !v.isEmpty { openAIChatModel = v }
if let v = ud.string(forKey: "ollamaChatModel"), !v.isEmpty { ollamaChatModel = v }
if let v = ud.string(forKey: "lmstudioChatModel"), !v.isEmpty { lmstudioChatModel = v }
+ if let v = ud.string(forKey: "deepseekChatModel"), !v.isEmpty { deepseekChatModel = v }
+ if let v = ud.string(forKey: "qwenChatModel"), !v.isEmpty { qwenChatModel = v }
+ if let v = ud.string(forKey: "moonshotChatModel"), !v.isEmpty { moonshotChatModel = v }
if let v = ud.string(forKey: "ollamaServerURL"), !v.isEmpty { ollamaServerURL = v }
if let v = ud.string(forKey: "lmstudioServerURL"), !v.isEmpty { lmstudioServerURL = v }
// Migrate old 60s default → 15s
diff --git a/NotchBuddy/Sources/App/ClaudeService.swift b/NotchBuddy/Sources/App/ClaudeService.swift
index 4411544a..ac4809ce 100644
--- a/NotchBuddy/Sources/App/ClaudeService.swift
+++ b/NotchBuddy/Sources/App/ClaudeService.swift
@@ -64,6 +64,9 @@ final class KeychainStore: @unchecked Sendable {
"anthropic-api-key",
"google-api-key",
"openai-api-key",
+ "deepseek-api-key",
+ "qwen-api-key",
+ "moonshot-api-key",
"resend-api-key", "resend-from",
"n8n-url", "n8n-api-key",
"vercel-token",
@@ -182,6 +185,21 @@ final class ClaudeService {
.map { (id: $0.id, label: $0.id) }
}
+ /// Fetches models from any OpenAI-compatible `/v1/models` endpoint.
+ static func fetchOpenAICompatibleModels(baseURL: String, apiKey: String) async -> [(id: String, label: String)] {
+ guard let url = URL(string: "\(baseURL)/models") else { return [] }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
+ guard let (data, response) = try? await URLSession.shared.data(for: req),
+ (response as? HTTPURLResponse)?.statusCode == 200,
+ let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+ let items = json["data"] as? [[String: Any]] else { return [] }
+ return items.compactMap { item in
+ guard let id = item["id"] as? String else { return nil }
+ return (id: id, label: id)
+ }
+ }
+
/// Chosen in Settings; falls back to the default when the field is left empty.
private var model: String {
let m = AppState.shared.claudeModel.trimmingCharacters(in: .whitespacesAndNewlines)
@@ -290,8 +308,11 @@ final class ClaudeService {
baseURL = LocalChat.normaliseURL(state.lmstudioServerURL)
} else {
switch provider {
- case .google: baseURL = "https://generativelanguage.googleapis.com/v1beta/openai"
- case .openai: baseURL = "https://api.openai.com/v1"
+ case .google: baseURL = "https://generativelanguage.googleapis.com/v1beta/openai"
+ case .openai: baseURL = "https://api.openai.com/v1"
+ case .deepseek: baseURL = "https://api.deepseek.com/v1"
+ case .qwen: baseURL = "https://dashscope.aliyuncs.com/compatible-mode/v1"
+ case .moonshot: baseURL = "https://api.moonshot.cn/v1"
case .anthropic, .ollama, .lmstudio: baseURL = ""
}
}
@@ -356,7 +377,7 @@ final class ClaudeService {
msgs.append(["role": "user", "content": userText])
conversationMessages.append(["role": "user", "content": userText])
- let useStream = provider.isLocal
+ let useStream = provider.isLocal || provider == .deepseek || provider == .qwen || provider == .moonshot
var body: [String: Any] = [
"model": state.activeChatModel,
"max_tokens": 4096,
@@ -411,9 +432,13 @@ final class ClaudeService {
let msg: String
switch e {
case .serverUnreachable:
- msg = provider == .ollama
- ? "Ollama isn't running. Open it, then ask again."
- : "Start the local server in LM Studio, then ask again."
+ if provider == .ollama {
+ msg = "Ollama isn't running. Open it, then ask again."
+ } else if provider == .lmstudio {
+ msg = "Start the local server in LM Studio, then ask again."
+ } else {
+ msg = "\(provider.displayName) is unreachable. Check your connection and API key."
+ }
case .modelNotFound(let m):
msg = "\(m) isn't installed. Pick another model above the chat box."
case .serverError(let s):
diff --git a/NotchBuddy/Sources/App/DesktopMochi.swift b/NotchBuddy/Sources/App/DesktopMochi.swift
index 71cbe8f9..3dbc0096 100644
--- a/NotchBuddy/Sources/App/DesktopMochi.swift
+++ b/NotchBuddy/Sources/App/DesktopMochi.swift
@@ -12,6 +12,8 @@ final class DesktopBotViewState: ObservableObject {
@Published var isSleeping: Bool = false
/// Pause entirely (screen sleep / lock).
@Published var paused: Bool = false
+ /// Mouse is over Mochi's body — drives hover scale animation.
+ @Published var isHovered: Bool = false
/// Bot center in the same coord space as AppState.mousePosition (DesktopSpace, y-down).
/// Updated every poll frame; Canvas reads it inside TimelineView — @Published not needed.
var lookOrigin: CGPoint = .zero
@@ -77,6 +79,8 @@ struct DesktopBotView: View {
engine.drawHandsAndExtras(context: c, size: size)
}
}
+ .scaleEffect(viewState.isHovered ? 1.07 : 1.0)
+ .animation(.spring(response: 0.25, dampingFraction: 0.6), value: viewState.isHovered)
.onChange(of: appState.effectiveState) { _, newState in
engine.setState(newState)
}
@@ -535,6 +539,10 @@ final class DesktopMochiController {
p.ignoresMouseEvents = !needsMouse
}
+ // Hover scale animation
+ let hovering = overBody && !isDragging
+ if viewState?.isHovered != hovering { viewState?.isHovered = hovering }
+
// Update eye-tracking origin every frame
viewState?.lookOrigin = lookOriginFor(panel: p)
let pos = DesktopSpace.topDown(mouse, desktopTop: IslandWindowController.desktopTop)
diff --git a/NotchBuddy/Sources/App/IslandRootView.swift b/NotchBuddy/Sources/App/IslandRootView.swift
index 4505ad0b..ffe8c2cf 100644
--- a/NotchBuddy/Sources/App/IslandRootView.swift
+++ b/NotchBuddy/Sources/App/IslandRootView.swift
@@ -522,7 +522,8 @@ struct IslandContentView: View {
struct IslandHeader: View {
@ObservedObject var state: AppState
-
+ @State private var gearHovered = false
+ @State private var soundHovered = false
@State private var closeHovered = false
/// Pending approval or mail draft: the island refuses to fold (fsm.isHeldOpen), so the
@@ -566,16 +567,18 @@ struct IslandHeader: View {
}) {
Image(systemName: state.view == .settings ? "gearshape.fill" : "gearshape")
.font(.system(size: 14))
- .foregroundColor(state.view == .settings ? Color(hex: "#F5F6F8") : Color(hex: "#8E939C"))
+ .foregroundColor(state.view == .settings || gearHovered ? Color(hex: "#F5F6F8") : Color(hex: "#8E939C"))
}
.buttonStyle(.plain)
+ .onHover { gearHovered = $0 }
Button(action: { state.soundEnabled.toggle() }) {
Image(systemName: state.soundEnabled ? "speaker.wave.2" : "speaker.slash")
.font(.system(size: 14))
- .foregroundColor(Color(hex: "#8E939C"))
+ .foregroundColor(soundHovered ? Color(hex: "#F5F6F8") : Color(hex: "#8E939C"))
}
.buttonStyle(.plain)
+ .onHover { soundHovered = $0 }
// Fold back to the compact island now, without waiting for the timer.
if !heldOpen {
@@ -583,10 +586,8 @@ struct IslandHeader: View {
NotificationCenter.default.post(name: .islandCollapse, object: nil)
}) {
Image(systemName: "xmark")
- .font(.system(size: 12, weight: .medium))
- .foregroundColor(Color(hex: closeHovered ? "#F5F6F8" : "#8E939C"))
- .frame(width: 16, height: 16)
- .contentShape(Rectangle())
+ .font(.system(size: 14))
+ .foregroundColor(closeHovered ? Color(hex: "#F5F6F8") : Color(hex: "#8E939C"))
}
.buttonStyle(.plain)
.help(String(localized: "Close"))
diff --git a/NotchBuddy/Sources/App/IslandViewContent.swift b/NotchBuddy/Sources/App/IslandViewContent.swift
index 7811823d..d62e1c99 100644
--- a/NotchBuddy/Sources/App/IslandViewContent.swift
+++ b/NotchBuddy/Sources/App/IslandViewContent.swift
@@ -1307,7 +1307,12 @@ struct PromptView: View {
ScrollView(.vertical, showsIndicators: false) {
VStack(alignment: .leading, spacing: 6) {
ForEach(state.chatHistory) { msg in
- ChatBubble(message: msg).id(msg.id)
+ ChatBubble(
+ message: msg,
+ isStreaming: state.stateOverride != nil
+ && msg.role == .assistant
+ && msg.id == state.chatHistory.last?.id
+ ).id(msg.id)
}
if state.stateOverride != nil {
HStack { TypingDotsView(); Spacer(minLength: 32) }
@@ -1594,6 +1599,9 @@ struct ModelPickerView: View {
case .openai: state.openAIChatModel = model.id
case .ollama: state.ollamaChatModel = model.id
case .lmstudio: state.lmstudioChatModel = model.id
+ case .deepseek: state.deepseekChatModel = model.id
+ case .qwen: state.qwenChatModel = model.id
+ case .moonshot: state.moonshotChatModel = model.id
}
isPresented = false
SoundEngine.shared.play("blip")
@@ -1628,6 +1636,7 @@ struct ModelPickerView: View {
struct ChatBubble: View {
let message: ChatMessage
+ var isStreaming: Bool = false
var body: some View {
if !message.content.isEmpty {
@@ -1643,7 +1652,22 @@ struct ChatBubble: View {
.background(Color.white.opacity(0.13))
.clipShape(RoundedRectangle(cornerRadius: 12))
} else {
- ChatMarkdownView(markdown: message.content)
+ Group {
+ if isStreaming {
+ TimelineView(.periodic(from: .now, by: 0.5)) { tl in
+ let show = Int(tl.date.timeIntervalSinceReferenceDate / 0.5).isMultiple(of: 2)
+ Text(message.content + (show ? "▌" : " "))
+ .font(.system(size: 12.5))
+ .foregroundColor(Color(hex: "#B0B5BE"))
+ .fixedSize(horizontal: false, vertical: true)
+ }
+ } else {
+ ChatMarkdownView(markdown: message.content)
+ }
+ }
+ .padding(.horizontal, 8).padding(.vertical, 6)
+ .background(Color.white.opacity(0.05))
+ .clipShape(RoundedRectangle(cornerRadius: 8))
Spacer(minLength: 8)
}
}
diff --git a/NotchBuddy/Sources/App/PortfolioController.swift b/NotchBuddy/Sources/App/PortfolioController.swift
index 83025188..8349d8d1 100644
--- a/NotchBuddy/Sources/App/PortfolioController.swift
+++ b/NotchBuddy/Sources/App/PortfolioController.swift
@@ -8,6 +8,8 @@ struct PortfolioHolding: Identifiable, Equatable, Sendable {
let symbol: String // "BTC", "ETH", "USDT"
let amount: Double // raw units (BTC, not satoshi)
var price: Double // USD price; filled after the price pass
+ var change24h: Double? = nil // % change vs 24 h ago; nil = unavailable
+ var priceHistory: [Double] = [] // last 7 daily closes, oldest first
var id: String { symbol }
var value: Double { amount * price }
}
@@ -29,26 +31,68 @@ enum ExchangeKind: String, CaseIterable, Sendable, Codable {
}
enum WalletKind: String, CaseIterable, Sendable, Codable {
- case bitcoin, ethereum, solana
+ // UTXO
+ case bitcoin, dogecoin, litecoin
+ // EVM — Ethereum mainnet + L2s + alt-L1s
+ case ethereum, polygon, bnbChain, avalanche, arbitrum, optimism, base
+ // Other L1s
+ case solana, tron, xrp, cardano, cosmos, near
+
var name: String {
switch self {
- case .bitcoin: return "Bitcoin"
- case .ethereum: return "Ethereum"
- case .solana: return "Solana"
+ case .bitcoin: return "Bitcoin"
+ case .dogecoin: return "Dogecoin"
+ case .litecoin: return "Litecoin"
+ case .ethereum: return "Ethereum"
+ case .polygon: return "Polygon"
+ case .bnbChain: return "BNB Chain"
+ case .avalanche: return "Avalanche"
+ case .arbitrum: return "Arbitrum"
+ case .optimism: return "Optimism"
+ case .base: return "Base"
+ case .solana: return "Solana"
+ case .tron: return "TRON"
+ case .xrp: return "XRP Ledger"
+ case .cardano: return "Cardano"
+ case .cosmos: return "Cosmos"
+ case .near: return "NEAR"
}
}
+
var symbol: String {
switch self {
- case .bitcoin: return "BTC"
- case .ethereum: return "ETH"
- case .solana: return "SOL"
+ case .bitcoin: return "BTC"
+ case .dogecoin: return "DOGE"
+ case .litecoin: return "LTC"
+ case .ethereum: return "ETH"
+ case .polygon: return "POL"
+ case .bnbChain: return "BNB"
+ case .avalanche: return "AVAX"
+ case .arbitrum: return "ETH"
+ case .optimism: return "ETH"
+ case .base: return "ETH"
+ case .solana: return "SOL"
+ case .tron: return "TRX"
+ case .xrp: return "XRP"
+ case .cardano: return "ADA"
+ case .cosmos: return "ATOM"
+ case .near: return "NEAR"
}
}
+
var placeholder: String {
switch self {
- case .bitcoin: return "bc1q… or 1… or 3…"
- case .ethereum: return "0x…"
- case .solana: return "base58 address"
+ case .bitcoin: return "bc1q… or 1… or 3…"
+ case .dogecoin: return "D…"
+ case .litecoin: return "ltc1… or L… or M…"
+ case .ethereum, .polygon, .bnbChain, .avalanche,
+ .arbitrum, .optimism, .base: return "0x…"
+ case .solana: return "base58 address"
+ case .tron: return "T…"
+ case .xrp: return "r…"
+ case .cardano: return "addr1…"
+ case .cosmos: return "cosmos1…"
+ case .near: return "alice.near or 64-char hex"
}
}
}
@@ -234,8 +278,10 @@ final class PortfolioController: ObservableObject {
for i in priced.indices {
for j in priced[i].holdings.indices {
let sym = priced[i].holdings[j].symbol
- if let p = prices[sym] {
- priced[i].holdings[j].price = p
+ if let info = prices[sym] {
+ priced[i].holdings[j].price = info.price
+ priced[i].holdings[j].change24h = info.change24h
+ priced[i].holdings[j].priceHistory = info.history
} else if sym == "USDT" || sym == "USDC" || sym == "BUSD" || sym == "DAI" {
priced[i].holdings[j].price = 1.0 // stable coins ≈ $1
}
@@ -267,30 +313,54 @@ final class PortfolioController: ObservableObject {
// MARK: - Price fetch (Coinbase public, no key)
- private nonisolated static func fetchPrices(symbols: [String]) async -> [String: Double] {
+ private struct PriceInfo: Sendable {
+ var price: Double
+ var change24h: Double?
+ var history: [Double] // 7 daily closes, oldest first
+ }
+
+ private nonisolated static func fetchPrices(symbols: [String]) async -> [String: PriceInfo] {
guard !symbols.isEmpty else { return [:] }
- var prices: [String: Double] = [:]
- await withTaskGroup(of: (String, Double?).self) { group in
+ var result: [String: PriceInfo] = [:]
+ await withTaskGroup(of: (String, PriceInfo?).self) { group in
for sym in symbols {
group.addTask {
let pair = "\(sym)-USD"
- guard let url = URL(string: "https://api.exchange.coinbase.com/products/\(pair)/stats") else {
- return (sym, nil)
+ let base = "https://api.exchange.coinbase.com/products/\(pair)"
+
+ // Stats: last price + 24h open
+ guard let statsURL = URL(string: "\(base)/stats") else { return (sym, nil) }
+ var statsReq = URLRequest(url: statsURL, timeoutInterval: 8)
+ statsReq.setValue("application/json", forHTTPHeaderField: "Accept")
+ guard let (statsData, statsResp) = try? await URLSession.shared.data(for: statsReq),
+ (statsResp as? HTTPURLResponse)?.statusCode == 200,
+ let statsJSON = try? JSONSerialization.jsonObject(with: statsData) as? [String: Any],
+ let last = statsJSON["last"].flatMap({ Self.num($0) }) else { return (sym, nil) }
+ let open24h = statsJSON["open"].flatMap({ Self.num($0) })
+ let change = open24h.map { o in o > 0 ? (last - o) / o * 100 : 0.0 }
+
+ // Candles: 7 daily closes for sparkline
+ var history: [Double] = []
+ if let candlesURL = URL(string: "\(base)/candles?granularity=86400") {
+ var candlesReq = URLRequest(url: candlesURL, timeoutInterval: 8)
+ candlesReq.setValue("application/json", forHTTPHeaderField: "Accept")
+ if let (candlesData, candlesResp) = try? await URLSession.shared.data(for: candlesReq),
+ (candlesResp as? HTTPURLResponse)?.statusCode == 200,
+ let arr = try? JSONSerialization.jsonObject(with: candlesData) as? [[Any]] {
+ // Candles: [time, low, high, open, close, volume] — newest first
+ history = arr.prefix(7).compactMap { $0.count > 4 ? Self.num($0[4]) : nil }
+ .reversed()
+ }
}
- var req = URLRequest(url: url, timeoutInterval: 8)
- req.setValue("application/json", forHTTPHeaderField: "Accept")
- guard let (data, resp) = try? await URLSession.shared.data(for: req),
- (resp as? HTTPURLResponse)?.statusCode == 200,
- let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
- let last = json["last"].flatMap({ Self.num($0) }) else { return (sym, nil) }
- return (sym, last)
+
+ return (sym, PriceInfo(price: last, change24h: change, history: history))
}
}
- for await (sym, price) in group {
- if let p = price { prices[sym] = p }
+ for await (sym, info) in group {
+ if let i = info { result[sym] = i }
}
}
- return prices
+ return result
}
private nonisolated static func num(_ v: Any) -> Double? {
@@ -592,11 +662,26 @@ private enum WalletFetcher {
static func fetch(_ wallet: PortfolioWallet) async throws -> [PortfolioHolding] {
switch wallet.kind {
- case .bitcoin: return try await fetchBTC(address: wallet.address)
- case .ethereum: return try await fetchETH(address: wallet.address)
- case .solana: return try await fetchSOL(address: wallet.address)
- }
- }
+ case .bitcoin: return try await fetchBTC(address: wallet.address)
+ case .dogecoin: return try await fetchBlockchair(address: wallet.address, chain: "dogecoin", symbol: "DOGE")
+ case .litecoin: return try await fetchBlockchair(address: wallet.address, chain: "litecoin", symbol: "LTC")
+ case .ethereum: return try await fetchEVM(address: wallet.address, rpcURL: "https://cloudflare-eth.com", symbol: "ETH")
+ case .polygon: return try await fetchEVM(address: wallet.address, rpcURL: "https://polygon-rpc.com", symbol: "POL")
+ case .bnbChain: return try await fetchEVM(address: wallet.address, rpcURL: "https://bsc-dataseed.binance.org", symbol: "BNB")
+ case .avalanche: return try await fetchEVM(address: wallet.address, rpcURL: "https://api.avax.network/ext/bc/C/rpc", symbol: "AVAX")
+ case .arbitrum: return try await fetchEVM(address: wallet.address, rpcURL: "https://arb1.arbitrum.io/rpc", symbol: "ETH")
+ case .optimism: return try await fetchEVM(address: wallet.address, rpcURL: "https://mainnet.optimism.io", symbol: "ETH")
+ case .base: return try await fetchEVM(address: wallet.address, rpcURL: "https://mainnet.base.org", symbol: "ETH")
+ case .solana: return try await fetchSOL(address: wallet.address)
+ case .tron: return try await fetchTRON(address: wallet.address)
+ case .xrp: return try await fetchXRP(address: wallet.address)
+ case .cardano: return try await fetchCardano(address: wallet.address)
+ case .cosmos: return try await fetchCosmos(address: wallet.address)
+ case .near: return try await fetchNEAR(address: wallet.address)
+ }
+ }
+
+ // MARK: BTC (blockchain.info)
private static func fetchBTC(address: String) async throws -> [PortfolioHolding] {
guard let url = URL(string: "https://blockchain.info/balance?active=\(address)&cors=true") else {
@@ -609,28 +694,62 @@ private enum WalletFetcher {
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let addrData = json[address] as? [String: Any],
let satoshi = addrData["final_balance"] as? Int else { throw FetchError.parseError }
- let btc = Double(satoshi) / 1e8
- return [PortfolioHolding(symbol: "BTC", amount: btc, price: 0)]
+ return [PortfolioHolding(symbol: "BTC", amount: Double(satoshi) / 1e8, price: 0)]
}
- private static func fetchETH(address: String) async throws -> [PortfolioHolding] {
- guard let url = URL(string: "https://cloudflare-eth.com") else { throw FetchError.networkError }
+ // MARK: UTXO via Blockchair (DOGE, LTC)
+
+ private static func fetchBlockchair(address: String, chain: String, symbol: String) async throws -> [PortfolioHolding] {
+ guard let url = URL(string: "https://api.blockchair.com/\(chain)/dashboards/address/\(address)") else {
+ throw FetchError.invalidAddress
+ }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.setValue("application/json", forHTTPHeaderField: "Accept")
+ guard let (data, resp) = try? await URLSession.shared.data(for: req),
+ (resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
+ guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+ let dataDict = json["data"] as? [String: Any],
+ let addrDict = dataDict[address] as? [String: Any],
+ let addrInfo = addrDict["address"] as? [String: Any] else { throw FetchError.parseError }
+ let satoshi: Double
+ if let i = addrInfo["balance"] as? Int { satoshi = Double(i) }
+ else if let s = addrInfo["balance"] as? String, let d = Double(s) { satoshi = d }
+ else { throw FetchError.parseError }
+ return [PortfolioHolding(symbol: symbol, amount: satoshi / 1e8, price: 0)]
+ }
+
+ // MARK: EVM (eth_getBalance JSON-RPC — works for any EVM chain)
+
+ private static func fetchEVM(address: String, rpcURL: String, symbol: String) async throws -> [PortfolioHolding] {
+ guard let url = URL(string: rpcURL) else { throw FetchError.networkError }
var req = URLRequest(url: url, timeoutInterval: 10)
req.httpMethod = "POST"
req.setValue("application/json", forHTTPHeaderField: "Content-Type")
- let body: [String: Any] = ["method": "eth_getBalance",
- "params": [address, "latest"],
- "id": 1, "jsonrpc": "2.0"]
+ let body: [String: Any] = ["jsonrpc": "2.0", "id": 1,
+ "method": "eth_getBalance", "params": [address, "latest"]]
req.httpBody = try? JSONSerialization.data(withJSONObject: body)
guard let (data, resp) = try? await URLSession.shared.data(for: req),
(resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let hexWei = json["result"] as? String,
- let wei = UInt64(hexWei.dropFirst(2), radix: 16) else { throw FetchError.parseError }
- let eth = Double(wei) / 1e18
- return [PortfolioHolding(symbol: "ETH", amount: eth, price: 0)]
+ let wei = hexToDouble(hexWei) else { throw FetchError.parseError }
+ return [PortfolioHolding(symbol: symbol, amount: wei / 1e18, price: 0)]
}
+ /// Converts a 0x-prefixed hex string to Double without integer overflow.
+ private static func hexToDouble(_ hex: String) -> Double? {
+ let s = hex.lowercased().hasPrefix("0x") ? String(hex.dropFirst(2)) : hex
+ guard !s.isEmpty else { return 0 }
+ var result: Double = 0
+ for c in s {
+ guard let digit = c.hexDigitValue else { return nil }
+ result = result * 16 + Double(digit)
+ }
+ return result
+ }
+
+ // MARK: Solana
+
private static func fetchSOL(address: String) async throws -> [PortfolioHolding] {
guard let url = URL(string: "https://api.mainnet-beta.solana.com") else { throw FetchError.networkError }
var req = URLRequest(url: url, timeoutInterval: 10)
@@ -644,8 +763,101 @@ private enum WalletFetcher {
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let result = json["result"] as? [String: Any],
let lamports = result["value"] as? Int else { throw FetchError.parseError }
- let sol = Double(lamports) / 1e9
- return [PortfolioHolding(symbol: "SOL", amount: sol, price: 0)]
+ return [PortfolioHolding(symbol: "SOL", amount: Double(lamports) / 1e9, price: 0)]
+ }
+
+ // MARK: TRON (TronGrid)
+
+ private static func fetchTRON(address: String) async throws -> [PortfolioHolding] {
+ guard let url = URL(string: "https://api.trongrid.io/v1/accounts/\(address)") else {
+ throw FetchError.invalidAddress
+ }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.setValue("application/json", forHTTPHeaderField: "Accept")
+ guard let (data, resp) = try? await URLSession.shared.data(for: req),
+ (resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
+ guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+ let dataArr = json["data"] as? [[String: Any]] else { throw FetchError.parseError }
+ let sun = dataArr.first.flatMap { $0["balance"] as? Int } ?? 0
+ return [PortfolioHolding(symbol: "TRX", amount: Double(sun) / 1e6, price: 0)]
+ }
+
+ // MARK: XRP Ledger
+
+ private static func fetchXRP(address: String) async throws -> [PortfolioHolding] {
+ guard let url = URL(string: "https://xrplcluster.com") else { throw FetchError.networkError }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.httpMethod = "POST"
+ req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+ let body: [String: Any] = ["method": "account_info",
+ "params": [["account": address, "ledger_index": "current"]]]
+ req.httpBody = try? JSONSerialization.data(withJSONObject: body)
+ guard let (data, resp) = try? await URLSession.shared.data(for: req),
+ (resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
+ guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+ let result = json["result"] as? [String: Any],
+ let acct = result["account_data"] as? [String: Any],
+ let dropsStr = acct["Balance"] as? String,
+ let drops = Double(dropsStr) else { throw FetchError.parseError }
+ return [PortfolioHolding(symbol: "XRP", amount: drops / 1e6, price: 0)]
+ }
+
+ // MARK: Cardano (Koios public API)
+
+ private static func fetchCardano(address: String) async throws -> [PortfolioHolding] {
+ guard let url = URL(string: "https://api.koios.rest/api/v1/address_info") else { throw FetchError.networkError }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.httpMethod = "POST"
+ req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+ req.setValue("application/json", forHTTPHeaderField: "Accept")
+ req.httpBody = try? JSONSerialization.data(withJSONObject: ["_addresses": [address]])
+ guard let (data, resp) = try? await URLSession.shared.data(for: req),
+ (resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
+ guard let arr = try? JSONSerialization.jsonObject(with: data) as? [[String: Any]],
+ let first = arr.first else { throw FetchError.parseError }
+ let lovelace = (first["balance"] as? String).flatMap(Double.init) ?? 0
+ return [PortfolioHolding(symbol: "ADA", amount: lovelace / 1e6, price: 0)]
+ }
+
+ // MARK: Cosmos Hub (REST)
+
+ private static func fetchCosmos(address: String) async throws -> [PortfolioHolding] {
+ let path = "https://rest.cosmos.directory/cosmoshub/cosmos/bank/v1beta1/balances/\(address)"
+ guard let url = URL(string: path) else { throw FetchError.invalidAddress }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.setValue("application/json", forHTTPHeaderField: "Accept")
+ guard let (data, resp) = try? await URLSession.shared.data(for: req),
+ (resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
+ guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+ let balances = json["balances"] as? [[String: Any]] else { throw FetchError.parseError }
+ var holdings: [PortfolioHolding] = []
+ for b in balances {
+ guard let denom = b["denom"] as? String, denom == "uatom",
+ let amtStr = b["amount"] as? String, let amt = Double(amtStr), amt > 0 else { continue }
+ holdings.append(PortfolioHolding(symbol: "ATOM", amount: amt / 1e6, price: 0))
+ }
+ return holdings
+ }
+
+ // MARK: NEAR Protocol
+
+ private static func fetchNEAR(address: String) async throws -> [PortfolioHolding] {
+ guard let url = URL(string: "https://rpc.mainnet.near.org") else { throw FetchError.networkError }
+ var req = URLRequest(url: url, timeoutInterval: 10)
+ req.httpMethod = "POST"
+ req.setValue("application/json", forHTTPHeaderField: "Content-Type")
+ let body: [String: Any] = ["jsonrpc": "2.0", "id": "dontcare", "method": "query",
+ "params": ["request_type": "view_account", "finality": "final",
+ "account_id": address]]
+ req.httpBody = try? JSONSerialization.data(withJSONObject: body)
+ guard let (data, resp) = try? await URLSession.shared.data(for: req),
+ (resp as? HTTPURLResponse)?.statusCode == 200 else { throw FetchError.networkError }
+ guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+ let result = json["result"] as? [String: Any],
+ let amtStr = result["amount"] as? String else { throw FetchError.parseError }
+ // amount is in yoctoNEAR (1 NEAR = 1e24)
+ let near = amtStr.reduce(0.0) { $0 * 10 + Double($1.wholeNumberValue ?? 0) } / 1e24
+ return [PortfolioHolding(symbol: "NEAR", amount: near, price: 0)]
}
}
@@ -688,20 +900,42 @@ extension PortfolioController {
enum AddressValidator {
/// Quick local check before hitting the network.
static func isPlausible(_ address: String, kind: WalletKind) -> Bool {
+ let a = address.trimmingCharacters(in: .whitespaces)
switch kind {
case .bitcoin:
- // bech32 (bc1q...), bech32m (bc1p...), P2PKH (1...), P2SH (3...)
- let a = address.trimmingCharacters(in: .whitespaces)
+ // bech32 (bc1q…), bech32m (bc1p…), P2PKH (1…), P2SH (3…)
if a.lowercased().hasPrefix("bc1") { return a.count >= 14 && a.count <= 90 }
if a.hasPrefix("1") || a.hasPrefix("3") { return a.count >= 25 && a.count <= 34 }
return false
- case .ethereum:
- let a = address.trimmingCharacters(in: .whitespaces)
+ case .dogecoin:
+ // P2PKH (D…) or P2SH (A…)
+ return (a.hasPrefix("D") || a.hasPrefix("A")) && a.count >= 25 && a.count <= 34
+ case .litecoin:
+ if a.lowercased().hasPrefix("ltc1") { return a.count >= 26 && a.count <= 90 }
+ if a.hasPrefix("L") || a.hasPrefix("M") { return a.count >= 25 && a.count <= 34 }
+ return false
+ case .ethereum, .polygon, .bnbChain, .avalanche, .arbitrum, .optimism, .base:
+ // All EVM chains share the same 0x-prefixed 20-byte address format
guard a.lowercased().hasPrefix("0x") else { return false }
return a.dropFirst(2).count == 40 && a.dropFirst(2).allSatisfy(\.isHexDigit)
case .solana:
- let a = address.trimmingCharacters(in: .whitespaces)
return a.count >= 32 && a.count <= 44
+ case .tron:
+ // Base58-encoded, always starts with T, 34 chars
+ return a.hasPrefix("T") && a.count == 34
+ case .xrp:
+ return a.hasPrefix("r") && a.count >= 25 && a.count <= 35
+ case .cardano:
+ // Shelley mainnet (addr1…), bech32, ~103 chars
+ return a.lowercased().hasPrefix("addr1") && a.count >= 50
+ case .cosmos:
+ // bech32, always cosmos1… + 38 chars = 45 total
+ return a.hasPrefix("cosmos1") && a.count == 45
+ case .near:
+ // Implicit account: 64 lowercase hex chars
+ if a.count == 64 { return a.allSatisfy { $0.isNumber || ($0 >= "a" && $0 <= "f") } }
+ // Named account: e.g. alice.near — must contain a dot
+ return a.count >= 5 && a.count <= 64 && a.contains(".")
}
}
}
diff --git a/NotchBuddy/Sources/App/PortfolioViews.swift b/NotchBuddy/Sources/App/PortfolioViews.swift
index c13b547e..b76dd3e0 100644
--- a/NotchBuddy/Sources/App/PortfolioViews.swift
+++ b/NotchBuddy/Sources/App/PortfolioViews.swift
@@ -121,6 +121,11 @@ private struct PortfolioHoldingRow: View {
let holding: PortfolioHolding
@State private var hovered = false
+ private var changeColor: Color {
+ guard let ch = holding.change24h else { return Color(hex: "#8E939C") }
+ return ch >= 0 ? Color(hex: "#4CAF50") : Color(hex: "#F4505E")
+ }
+
var body: some View {
HStack(spacing: 6) {
Text(verbatim: holding.symbol)
@@ -134,6 +139,18 @@ private struct PortfolioHoldingRow: View {
.monospacedDigit()
.lineLimit(1)
Spacer(minLength: 2)
+ if holding.priceHistory.count >= 2 {
+ let positive = holding.change24h.map { $0 >= 0 } ?? true
+ SparklineView(prices: holding.priceHistory, positive: positive)
+ .frame(width: 36, height: 14)
+ }
+ if let ch = holding.change24h {
+ Text(String(format: ch >= 0 ? "+%.1f%%" : "%.1f%%", ch))
+ .font(.system(size: 9, weight: .medium))
+ .foregroundColor(changeColor)
+ .monospacedDigit()
+ .lineLimit(1)
+ }
if holding.price > 0 {
Text(verbatim: PortfolioController.formatValue(holding.value))
.font(.system(size: 11, weight: .medium))
@@ -153,3 +170,31 @@ private struct PortfolioHoldingRow: View {
.onHover { hovered = $0 }
}
}
+
+// MARK: - Sparkline
+
+private struct SparklineView: View {
+ let prices: [Double]
+ let positive: Bool
+
+ var body: some View {
+ GeometryReader { geo in
+ let mn = prices.min() ?? 0, mx = prices.max() ?? 1
+ let range = mx - mn == 0 ? 1.0 : mx - mn
+ let w = geo.size.width, h = geo.size.height
+ let n = prices.count
+ Path { path in
+ for (i, p) in prices.enumerated() {
+ let x = w * CGFloat(i) / CGFloat(n - 1)
+ let y = h - h * CGFloat((p - mn) / range)
+ if i == 0 { path.move(to: CGPoint(x: x, y: y)) }
+ else { path.addLine(to: CGPoint(x: x, y: y)) }
+ }
+ }
+ .stroke(
+ positive ? Color(hex: "#4CAF50") : Color(hex: "#F4505E"),
+ style: StrokeStyle(lineWidth: 1.2, lineCap: .round, lineJoin: .round)
+ )
+ }
+ }
+}
diff --git a/NotchBuddy/Sources/App/SettingsView.swift b/NotchBuddy/Sources/App/SettingsView.swift
index a0c8bc5a..0c70b6d3 100644
--- a/NotchBuddy/Sources/App/SettingsView.swift
+++ b/NotchBuddy/Sources/App/SettingsView.swift
@@ -86,8 +86,11 @@ struct SettingsView: View {
#endif
// Multi-provider chat keys
- @State private var googleKey: String = KeychainStore.shared.get("google-api-key") ?? ""
- @State private var openAIKey: String = KeychainStore.shared.get("openai-api-key") ?? ""
+ @State private var googleKey: String = KeychainStore.shared.get("google-api-key") ?? ""
+ @State private var openAIKey: String = KeychainStore.shared.get("openai-api-key") ?? ""
+ @State private var deepseekKey: String = KeychainStore.shared.get("deepseek-api-key") ?? ""
+ @State private var qwenKey: String = KeychainStore.shared.get("qwen-api-key") ?? ""
+ @State private var moonshotKey: String = KeychainStore.shared.get("moonshot-api-key") ?? ""
@State private var ollamaURL: String = AppState.shared.ollamaServerURL
@State private var lmstudioURL: String = AppState.shared.lmstudioServerURL
@State private var connectingOllama: Bool = false
@@ -1072,6 +1075,48 @@ struct SettingsView: View {
statusMessage = String(localized: "status.openai-key-saved")
}
.buttonStyle(.borderedProminent)
+
+ Divider()
+
+ HStack(spacing: 8) {
+ Circle().fill(Color(hex: "#5B8FF9")).frame(width: 8, height: 8)
+ Text("DeepSeek").font(.system(size: 12, weight: .semibold))
+ }
+ SecureField("API key", text: $deepseekKey)
+ .textFieldStyle(.roundedBorder)
+ Button(String(localized: "Save")) {
+ KeychainStore.shared.set("deepseek-api-key", value: deepseekKey)
+ statusMessage = "DeepSeek key saved."
+ }
+ .buttonStyle(.borderedProminent)
+
+ Divider()
+
+ HStack(spacing: 8) {
+ Circle().fill(Color(hex: "#FF6A00")).frame(width: 8, height: 8)
+ Text("Qwen (Alibaba)").font(.system(size: 12, weight: .semibold))
+ }
+ SecureField("API key", text: $qwenKey)
+ .textFieldStyle(.roundedBorder)
+ Button(String(localized: "Save")) {
+ KeychainStore.shared.set("qwen-api-key", value: qwenKey)
+ statusMessage = "Qwen key saved."
+ }
+ .buttonStyle(.borderedProminent)
+
+ Divider()
+
+ HStack(spacing: 8) {
+ Circle().fill(Color(hex: "#7C5CFC")).frame(width: 8, height: 8)
+ Text("Moonshot (Kimi)").font(.system(size: 12, weight: .semibold))
+ }
+ SecureField("API key", text: $moonshotKey)
+ .textFieldStyle(.roundedBorder)
+ Button(String(localized: "Save")) {
+ KeychainStore.shared.set("moonshot-api-key", value: moonshotKey)
+ statusMessage = "Moonshot key saved."
+ }
+ .buttonStyle(.borderedProminent)
}
.padding(.vertical, 4)
}
diff --git a/NotchBuddy/Sources/CoucouKit/IslandTypes.swift b/NotchBuddy/Sources/CoucouKit/IslandTypes.swift
index d7c94d08..2921802d 100644
--- a/NotchBuddy/Sources/CoucouKit/IslandTypes.swift
+++ b/NotchBuddy/Sources/CoucouKit/IslandTypes.swift
@@ -98,6 +98,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case openai = "openai"
case ollama = "ollama"
case lmstudio = "lmstudio"
+ case deepseek = "deepseek"
+ case qwen = "qwen"
+ case moonshot = "moonshot"
var displayName: String {
switch self {
@@ -106,6 +109,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case .openai: "OpenAI"
case .ollama: "Ollama"
case .lmstudio: "LM Studio"
+ case .deepseek: "DeepSeek"
+ case .qwen: "Qwen"
+ case .moonshot: "Moonshot"
}
}
@@ -116,6 +122,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case .openai: "#10A37F"
case .ollama: "#FACC15"
case .lmstudio: "#A3E635"
+ case .deepseek: "#5B8FF9"
+ case .qwen: "#FF6A00"
+ case .moonshot: "#7C5CFC"
}
}
@@ -126,6 +135,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case .openai: "gpt-4o"
case .ollama: "llama3.2"
case .lmstudio: "local-model"
+ case .deepseek: "deepseek-chat"
+ case .qwen: "qwen-max"
+ case .moonshot: "moonshot-v1-32k"
}
}
@@ -136,6 +148,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case .openai: "openai-api-key"
case .ollama: ""
case .lmstudio: ""
+ case .deepseek: "deepseek-api-key"
+ case .qwen: "qwen-api-key"
+ case .moonshot: "moonshot-api-key"
}
}
@@ -150,6 +165,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case .openai: "ai_openai"
case .ollama: "ai_ollama"
case .lmstudio: "ai_lmstudio"
+ case .deepseek: "ai_deepseek"
+ case .qwen: "ai_qwen"
+ case .moonshot: "ai_moonshot"
}
}
@@ -160,6 +178,9 @@ enum ChatProvider: String, CaseIterable, Codable {
case "ai_openai": self = .openai
case "ai_ollama": self = .ollama
case "ai_lmstudio": self = .lmstudio
+ case "ai_deepseek": self = .deepseek
+ case "ai_qwen": self = .qwen
+ case "ai_moonshot": self = .moonshot
default: return nil
}
}