Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

fix: 修复大型会话来源识别并完整显示额度余额

Bobfbcb64a8f54a
diff --git a/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift b/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift
index cbd0f47..cc0d0f6 100644
--- a/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift
+++ b/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift
@@ -190,7 +190,7 @@ nonisolated enum WorkflowHookEventRecorder {
}
}
-/// rollout 格式不是稳定 Hook 接口, 只读取首条完整 session_meta 并在固定预算内失败开放
+/// Codex 把来源写在大型指令字段之前, 在固定预算内读取已完成的元数据字段
private nonisolated enum WorkflowEventOriginReader {
static func origin(transcriptPath: String?) -> WorkflowEventOrigin {
guard let transcriptPath else {
@@ -214,21 +214,76 @@ private nonisolated enum WorkflowEventOriginReader {
}
data.append(chunk)
- guard let newlineIndex = data.firstIndex(of: JSONLines.newlineByte) else {
- continue
+ if let newlineIndex = data.firstIndex(of: JSONLines.newlineByte) {
+ return decodedOrigin(from: Data(data[..<newlineIndex])) ?? .unknown
}
- let line = Data(data[..<newlineIndex])
- guard let envelope = try? JSONDecoder().decode(
- WorkflowRolloutMetadataEnvelope.self,
- from: line
- ), envelope.type == "session_meta" else {
- return .unknown
+
+ if let prefix = metadataPrefix(from: data),
+ let origin = decodedOrigin(from: prefix) {
+ return origin
}
- return envelope.payload?.source?.origin ?? .unknown
}
return .unknown
}
+ private static func decodedOrigin(from data: Data) -> WorkflowEventOrigin? {
+ guard let envelope = try? JSONDecoder().decode(WorkflowRolloutMetadataEnvelope.self, from: data),
+ envelope.type == "session_meta" else {
+ return nil
+ }
+ return envelope.payload?.source?.origin
+ }
+
+ /// 只在外层或 payload 的完整字段边界补齐对象, 字符串和嵌套值交给 JSONDecoder 验证
+ private static func metadataPrefix(from data: Data) -> Data? {
+ var containers: [UInt8] = []
+ var isInString = false
+ var isEscaped = false
+ var prefixEnd: Int?
+ var closingBraces = 0
+
+ for (index, byte) in data.enumerated() {
+ if isInString {
+ if isEscaped {
+ isEscaped = false
+ } else if byte == 0x5C {
+ isEscaped = true
+ } else if byte == 0x22 {
+ isInString = false
+ }
+ continue
+ }
+
+ switch byte {
+ case 0x22:
+ isInString = true
+ case 0x7B, 0x5B:
+ guard containers.count < 64 else { return nil }
+ containers.append(byte)
+ case 0x7D, 0x5D:
+ let opening: UInt8 = byte == 0x7D ? 0x7B : 0x5B
+ guard containers.popLast() == opening else { return nil }
+ if containers.isEmpty {
+ return data
+ }
+ if containers == [0x7B] {
+ prefixEnd = index + 1
+ closingBraces = 1
+ }
+ case 0x2C:
+ if containers == [0x7B] || containers == [0x7B, 0x7B] {
+ prefixEnd = index
+ closingBraces = containers.count
+ }
+ default:
+ break
+ }
+ }
+
+ guard let prefixEnd else { return nil }
+ return Data(data.prefix(prefixEnd)) + Data(repeating: 0x7D, count: closingBraces)
+ }
+
private static let readChunkByteCount = 32 * 1024
private static let firstLineByteLimit = 256 * 1024
}
diff --git a/CodexBar/Views/Menu/CodexStatusMenuSections.swift b/CodexBar/Views/Menu/CodexStatusMenuSections.swift
index 44ad424..d8d4cbf 100644
--- a/CodexBar/Views/Menu/CodexStatusMenuSections.swift
+++ b/CodexBar/Views/Menu/CodexStatusMenuSections.swift
@@ -64,21 +64,15 @@ struct AccountCard: View {
private static func planBadgeTint(for plan: String, colorScheme: ColorScheme) -> Color {
let normalizedPlan = plan.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
- let rule = planTintRules.first { rule in
+ let colors = planTintRules.first { rule in
rule.keywords.contains { normalizedPlan.contains($0) }
- }
- let hex = if colorScheme == .dark {
- rule?.colors.dark ?? 0x67E8F9
- } else {
- rule?.colors.light ?? 0x0E7490
- }
- return Color(hex: hex)
+ }?.colors ?? (light: 0x0E7490, dark: 0x67E8F9)
+ return Color(hex: colorScheme == .dark ? colors.dark : colors.light)
}
private static let planTintRules: [(keywords: [String], colors: (light: Int, dark: Int))] = [
(["enterprise"], (0x52677F, 0xA7AFBA)),
- (["team", "business"], (0x147B82, 0x82B3B5)),
- (["pro"], (0x147B82, 0x82B3B5)),
+ (["team", "business", "pro"], (0x147B82, 0x82B3B5)),
(["plus"], (0x256FA3, 0x89A9C2)),
(["edu"], (0x9B5F12, 0xC7A96B)),
(["free"], (0x167A5E, 0x7FB5A4))
@@ -183,11 +177,12 @@ struct QuotaLimitsSection: View {
.foregroundStyle(.primary)
.lineLimit(1)
.truncationMode(.middle)
+ .layoutPriority(-1)
Spacer(minLength: 8)
if showsPrimaryMetadata, let credits, let value = creditsDisplayValue(credits) {
- creditsBalance(value: value, credits: credits)
+ metadataCapsule(String(localized: "quota.credits.value", defaultValue: "\(value)"))
}
if showsPrimaryMetadata, let resetCreditsAvailableCount, resetCreditsAvailableCount > 0 {
@@ -203,72 +198,34 @@ struct QuotaLimitsSection: View {
}
}
- @ViewBuilder
- private func creditsBalance(value: String, credits: RateLimitCreditsSnapshot) -> some View {
- let capsule = metadataCapsule(String(localized: "quota.credits.value", defaultValue: "\(value)"))
-
- if let helpText = creditsHelpText(value: value, credits: credits) {
- capsule.help(helpText)
- } else {
- capsule
- }
- }
-
private func creditsDisplayValue(_ credits: RateLimitCreditsSnapshot) -> String? {
if credits.unlimited {
return String(localized: "quota.value.unlimited")
}
- if let balance = normalizedCreditsBalance(credits.balance) {
- return compactCreditsBalance(balance)
- }
-
- return credits.hasCredits ? String(localized: "common.status.available") : nil
- }
-
- private func creditsHelpText(value: String, credits: RateLimitCreditsSnapshot) -> String? {
- guard value.hasSuffix("K") || value.hasSuffix("M"),
- let balance = normalizedCreditsBalance(credits.balance) else {
- return nil
- }
-
- return balance
+ return normalizedCreditsBalance(credits.balance)
+ ?? (credits.hasCredits ? String(localized: "common.status.available") : nil)
}
private func normalizedCreditsBalance(_ balance: String?) -> String? {
- guard let balance = balance?.trimmingCharacters(in: .whitespacesAndNewlines), !balance.isEmpty else {
+ guard var balance = balance?.trimmingCharacters(in: .whitespacesAndNewlines), !balance.isEmpty else {
return nil
}
- return balance
- }
-
- private func compactCreditsBalance(_ balance: String) -> String {
- guard let amount = Double(balance), amount.isFinite else {
- return truncatedCreditsBalance(balance)
- }
-
- let magnitude = abs(amount)
- guard magnitude >= Self.compactCreditsThreshold else {
- return truncatedCreditsBalance(balance)
+ guard let decimalPoint = balance.firstIndex(of: "."),
+ decimalPoint != balance.startIndex,
+ balance[balance.index(after: decimalPoint)...].allSatisfy(\.isNumber) else {
+ return balance
}
- guard let unit = Self.compactCreditsUnits.first(where: { magnitude >= $0.divisor }),
- let formattedAmount = Self.compactCreditsFormatter.string(
- from: NSNumber(value: amount / unit.divisor)
- ) else {
- return truncatedCreditsBalance(balance)
+ while balance.hasSuffix("0") {
+ balance.removeLast()
}
-
- return truncatedCreditsBalance("\(formattedAmount)\(unit.suffix)")
- }
-
- private func truncatedCreditsBalance(_ balance: String) -> String {
- guard balance.count > Self.maximumFallbackCreditsCharacters else {
- return balance
+ if balance.hasSuffix(".") {
+ balance.removeLast()
}
- return "\(balance.prefix(Self.maximumFallbackCreditsCharacters - 3))..."
+ return balance
}
private func resetCreditsButton(count: Int) -> some View {
@@ -297,25 +254,6 @@ struct QuotaLimitsSection: View {
.padding(.vertical, 2)
.liquidGlassCapsule(tint: .green)
}
-
- private static let compactCreditsThreshold = 10000.0
- private static let maximumFallbackCreditsCharacters = 12
- private static let compactCreditsUnits: [(divisor: Double, suffix: String)] = [
- (1000000000000, "T"),
- (1000000000, "B"),
- (1000000, "M"),
- (1000, "K")
- ]
-
- private static let compactCreditsFormatter: NumberFormatter = {
- let formatter = NumberFormatter()
- formatter.locale = Locale(identifier: "en_US_POSIX")
- formatter.numberStyle = .decimal
- formatter.usesGroupingSeparator = false
- formatter.minimumFractionDigits = 0
- formatter.maximumFractionDigits = 1
- return formatter
- }()
}
/// 底部更新时间行, 同时承载 Sparkle 被动更新提示
@@ -407,9 +345,18 @@ struct WorkflowSyncDisplayState: Equatable {
if settings.isSyncing {
self = .syncing
} else if settings.hasSyncFailure {
- self = .failed(message: settings.syncFailureMessage)
+ self.init(
+ symbolName: "exclamationmark.icloud",
+ tint: .orange,
+ helpText: settings.syncFailureMessage ?? WorkflowSyncFailureReason.retryLater.message
+ )
} else {
- self = .enabled(settings.lastUploadAtText)
+ self.init(
+ symbolName: "icloud",
+ tint: .codexSecondaryLabel,
+ helpText: settings.lastUploadAtText.map { String(localized: "sync.status.last-sync-time", defaultValue: "\($0)") }
+ ?? String(localized: "sync.status.no-history")
+ )
}
}
@@ -419,15 +366,6 @@ struct WorkflowSyncDisplayState: Equatable {
self.helpText = helpText
}
- private static func enabled(_ lastSyncText: String?) -> WorkflowSyncDisplayState {
- WorkflowSyncDisplayState(
- symbolName: "icloud",
- tint: .codexSecondaryLabel,
- helpText: lastSyncText.map { String(localized: "sync.status.last-sync-time", defaultValue: "\($0)") }
- ?? String(localized: "sync.status.no-history")
- )
- }
-
private static let disabled = WorkflowSyncDisplayState(
symbolName: "icloud.slash",
tint: .codexSecondaryLabel,
@@ -439,12 +377,4 @@ struct WorkflowSyncDisplayState: Equatable {
tint: .blue,
helpText: String(localized: "sync.status.syncing")
)
-
- private static func failed(message: String?) -> WorkflowSyncDisplayState {
- WorkflowSyncDisplayState(
- symbolName: "exclamationmark.icloud",
- tint: .orange,
- helpText: message ?? WorkflowSyncFailureReason.retryLater.message
- )
- }
}