CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
fix: 修复同步与通知竞态并完善防睡眠和动画控制
Bob27f8a4e18b20
diff --git a/CodexBar/Controllers/ActivityPanelController.swift b/CodexBar/Controllers/ActivityPanelController.swiftindex 78d6323..ff67eb1 100644--- a/CodexBar/Controllers/ActivityPanelController.swift+++ b/CodexBar/Controllers/ActivityPanelController.swift@@ -21,6 +21,7 @@ final class ActivityPanelController {private var panelUpdateTask: Task<Void, Never>?private lazy var presenter = SidePanelDrawerPresenter(animationKey: Metrics.drawerTransformAnimationKey,+ areAnimationsEnabled: { [weak self] in self?.mainPanelSettings.areAnimationsEnabled ?? false },contentViewProvider: { [weak self] inself?.contentHost.contentView}diff --git a/CodexBar/Controllers/HeatmapPanelController.swift b/CodexBar/Controllers/HeatmapPanelController.swiftindex c5a736b..ecc08e2 100644--- a/CodexBar/Controllers/HeatmapPanelController.swift+++ b/CodexBar/Controllers/HeatmapPanelController.swift@@ -17,7 +17,8 @@ final class HeatmapPanelController {self?.contentHost.contentView},animationKey: Metrics.drawerTransformAnimationKey,- overscan: SidePanelSupport.Metrics.drawerOverscan+ overscan: SidePanelSupport.Metrics.drawerOverscan,+ areAnimationsEnabled: { [weak self] in self?.mainPanelSettings.areAnimationsEnabled ?? false })private var hideTask: Task<Void, Never>?private var currentSide = UsageHeatmapDetailSide.left@@ -82,6 +83,12 @@ final class HeatmapPanelController {return}+ guard mainPanelSettings.areAnimationsEnabled else {+ drawerAnimator.resetVisualState(for: panel)+ orderOut(panel)+ hideTask = nil+ return+ }drawerTransition = .exitinglet hidden = drawerAnimator.hiddenTranslation(for: side, panelWidth: panel.frame.width)drawerAnimator.animateTranslation(@@ -143,6 +150,14 @@ final class HeatmapPanelController {}private func updateVisiblePanel(_ request: PanelRequest, on panel: NSPanel) {+ guard mainPanelSettings.areAnimationsEnabled else {+ visibilityGeneration += 1+ pendingSideSwitchRequest = nil+ drawerTransition = .idle+ apply(request, to: panel)+ drawerAnimator.resetVisualState(for: panel)+ return+ }if drawerTransition == .switchingSide {// 切边动画过程中只保留最新请求// 防止连续 hover 造成动画队列堆积@@ -176,8 +191,9 @@ final class HeatmapPanelController {private func showPanelWithDrawerAnimation(_ panel: NSPanel, relativeTo menuSurfaceWindow: NSWindow) {let generation = visibilityGenerationlet hidden = drawerAnimator.hiddenTranslation(for: currentSide, panelWidth: panel.frame.width)- drawerAnimator.setTranslation(hidden)- panel.alphaValue = 0+ let animates = mainPanelSettings.areAnimationsEnabled+ drawerAnimator.setTranslation(animates ? hidden : 0)+ panel.alphaValue = animates ? 0 : 1attach(panel, to: menuSurfaceWindow)panel.order(.above, relativeTo: menuSurfaceWindow.windowNumber)drawerTransition = .enteringdiff --git a/CodexBar/Controllers/MenuSurfaceFadeCoordinator.swift b/CodexBar/Controllers/MenuSurfaceFadeCoordinator.swiftindex 507d5f7..b7cfcbb 100644--- a/CodexBar/Controllers/MenuSurfaceFadeCoordinator.swift+++ b/CodexBar/Controllers/MenuSurfaceFadeCoordinator.swift@@ -34,6 +34,11 @@ final class MenuSurfaceFadeCoordinator {func fadeIn(duration: TimeInterval, completion: @escaping () -> Void) {cancel()+ guard duration > 0 else {+ resetAlpha()+ completion()+ return+ }fade(to: 1, duration: duration)completionTask = Task { @MainActor [weak self] in@@ -53,7 +58,6 @@ final class MenuSurfaceFadeCoordinator {guard let contentView else {return false}-let activeMenuSurfaceWindow = contentView.windowfade(to: 0, duration: duration)diff --git a/CodexBar/Controllers/OptionsPanelController.swift b/CodexBar/Controllers/OptionsPanelController.swiftindex f4d66f7..2405e74 100644--- a/CodexBar/Controllers/OptionsPanelController.swift+++ b/CodexBar/Controllers/OptionsPanelController.swift@@ -66,6 +66,7 @@ final class OptionsPanelController {private lazy var presenter = SidePanelDrawerPresenter(animationKey: animationKey,usesUntranslatedInitialLayout: true,+ areAnimationsEnabled: { [weak self] in self?.mainPanelSettings.areAnimationsEnabled ?? false },contentViewProvider: { [weak self] inself?.hostingController?.view}diff --git a/CodexBar/Controllers/ResetCreditsPanelController.swift b/CodexBar/Controllers/ResetCreditsPanelController.swiftindex cd27058..bfbc06e 100644--- a/CodexBar/Controllers/ResetCreditsPanelController.swift+++ b/CodexBar/Controllers/ResetCreditsPanelController.swift@@ -13,6 +13,7 @@ final class ResetCreditsPanelController {)private lazy var presenter = SidePanelDrawerPresenter(animationKey: Metrics.drawerTransformAnimationKey,+ areAnimationsEnabled: { [weak self] in self?.mainPanelSettings.areAnimationsEnabled ?? false },contentViewProvider: { [weak self] inself?.contentHost.contentView}diff --git a/CodexBar/Controllers/SidePanelPresenter.swift b/CodexBar/Controllers/SidePanelPresenter.swiftindex ed6f0b9..d19c6f8 100644--- a/CodexBar/Controllers/SidePanelPresenter.swift+++ b/CodexBar/Controllers/SidePanelPresenter.swift@@ -8,15 +8,18 @@ final class SidePanelDrawerAnimator {private let contentViewProvider: @MainActor () -> NSView?private let animationKey: Stringprivate let overscan: CGFloat+ private let areAnimationsEnabled: () -> Boolinit(contentViewProvider: @escaping @MainActor () -> NSView?,animationKey: String,- overscan: CGFloat+ overscan: CGFloat,+ areAnimationsEnabled: @escaping () -> Bool) {self.contentViewProvider = contentViewProviderself.animationKey = animationKeyself.overscan = overscan+ self.areAnimationsEnabled = areAnimationsEnabled}func hiddenTranslation(for side: UsageHeatmapDetailSide, panelWidth: CGFloat) -> CGFloat {@@ -49,6 +52,11 @@ final class SidePanelDrawerAnimator {timing: CAMediaTimingFunctionName,completion: (() -> Void)? = nil) {+ guard areAnimationsEnabled() else {+ setTranslation(translationX)+ completion?()+ return+ }guard let layer = contentViewProvider()?.layer else {completion?()return@@ -79,6 +87,12 @@ final class SidePanelDrawerAnimator {isCurrent: @escaping @MainActor () -> Bool,completion: @escaping @MainActor () -> Void) {+ guard areAnimationsEnabled() else {+ guard isCurrent() else { return }+ resetVisualState(for: panel)+ completion()+ return+ }panel.contentView?.layoutSubtreeIfNeeded()panel.displayIfNeeded()CATransaction.flush()@@ -129,6 +143,7 @@ final class SidePanelDrawerAnimator {@MainActorfinal class SidePanelDrawerPresenter {private let usesUntranslatedInitialLayout: Bool+ private let areAnimationsEnabled: () -> Boolprivate let drawerAnimator: SidePanelDrawerAnimatorprivate weak var panel: NSPanel?private var visibilityGeneration = 0@@ -139,13 +154,16 @@ final class SidePanelDrawerPresenter {init(animationKey: String,usesUntranslatedInitialLayout: Bool = false,+ areAnimationsEnabled: @escaping () -> Bool,contentViewProvider: @escaping @MainActor () -> NSView?) {self.usesUntranslatedInitialLayout = usesUntranslatedInitialLayout+ self.areAnimationsEnabled = areAnimationsEnableddrawerAnimator = SidePanelDrawerAnimator(contentViewProvider: contentViewProvider,animationKey: animationKey,- overscan: SidePanelSupport.Metrics.drawerOverscan+ overscan: SidePanelSupport.Metrics.drawerOverscan,+ areAnimationsEnabled: areAnimationsEnabled)}@@ -168,8 +186,9 @@ final class SidePanelDrawerPresenter {let generation = visibilityGenerationlet hidden = drawerAnimator.hiddenTranslation(for: currentSide, panelWidth: panel.frame.width)- drawerAnimator.setTranslation(usesUntranslatedInitialLayout ? 0 : hidden)- panel.alphaValue = 0+ let animates = areAnimationsEnabled()+ drawerAnimator.setTranslation(usesUntranslatedInitialLayout || !animates ? 0 : hidden)+ panel.alphaValue = animates ? 0 : 1self.parentWindow = parentWindowSidePanelSupport.attach(panel, to: parentWindow)panel.order(.above, relativeTo: parentWindow.windowNumber)@@ -201,7 +220,7 @@ final class SidePanelDrawerPresenter {}// 不可见的子窗口仍可能挂在父窗口上, 收尾不能只依据 isVisible- if immediate || !panel.isVisible {+ if immediate || !areAnimationsEnabled() || !panel.isVisible {visibilityGeneration += 1drawerAnimator.resetVisualState(for: panel)isExitAnimationRunning = falsediff --git a/CodexBar/Controllers/StatusItemController.swift b/CodexBar/Controllers/StatusItemController.swiftindex 4de9379..375de04 100644--- a/CodexBar/Controllers/StatusItemController.swift+++ b/CodexBar/Controllers/StatusItemController.swift@@ -584,7 +584,7 @@ final class StatusItemController: NSObject, NSMenuDelegate {})- menuSurfaceFadeCoordinator.fadeIn(duration: Metrics.fadeInDuration) { [weak self] in+ menuSurfaceFadeCoordinator.fadeIn(duration: mainPanelSettings.areAnimationsEnabled ? Metrics.fadeInDuration : 0) { [weak self] inguard let self, isActiveMenuSurfaceVisible else { return }menuSurfaceState = .shown// 展开完成后再刷新共享状态, 避免主面板与设置窗口在淡入期间一起重算@@ -728,6 +728,7 @@ final class StatusItemController: NSObject, NSMenuDelegate {// MARK: - 关闭流程private func closeMenuSurface(animated: Bool = true) {+ let animated = animated && mainPanelSettings.areAnimationsEnabledif menuSurfaceState == .closing, animated {return}diff --git a/CodexBar/Services/KeepAlive/KeepAliveController.swift b/CodexBar/Services/KeepAlive/KeepAliveController.swiftindex f34cf63..fe046ff 100644--- a/CodexBar/Services/KeepAlive/KeepAliveController.swift+++ b/CodexBar/Services/KeepAlive/KeepAliveController.swift@@ -105,7 +105,7 @@ final class KeepAliveController: ObservableObject {private var isPowerHelperStatusAvailable = falseprivate var powerHelperFailureTask: Task<Void, Never>?private var powerHelperLifecycleGeneration: UInt64 = 0- private var retryAttempt = 0+ private var sleepRetry = SleepPreventionRetry()private var powerHelperRegistrationTask: Task<Void, Never>?private let powerHelperPackageValidation = PowerHelperPackageValidation()/// 仅通过派生状态更新 UI, 此属性不发布变化@@ -671,23 +671,24 @@ final class KeepAliveController: ObservableObject {logSleepConditionsIfChanged(blockReason: blockReason, trigger: trigger)// Power Helper 未授权或刷新期间不发普通租约请求, 未确认的租约留待恢复后清理- guard powerHelperStatus == .enabled, !isRefreshingPowerHelper else {+ guard isPowerHelperStatusAvailable, powerHelperStatus == .enabled, !isRefreshingPowerHelper else {cancelRetryTask()releaseSleepPrevention()return}guard wantsSleepDisabled else {- cancelRetryTask()if mayHavePowerHelperLease || isPreventingSleep {applySleepPreventionRequested(false)} else {+ cancelRetryTask()releaseSleepPrevention()}return}if force {+ cancelRetryTask()appliedSleepPreventionRequested = nil}applySleepPreventionRequested(true)@@ -791,8 +792,16 @@ final class KeepAliveController: ObservableObject {_ requested: Bool,force: Bool = false,isObservation: Bool = false,+ isRetry: Bool = false,completion: ((Bool) -> Void)? = nil) {+ if force || (sleepRetry.requested != nil && sleepRetry.requested != requested) {+ cancelRetryTask()+ }+ guard sleepRetry.allowsRequest(isRetry: isRetry) else {+ completion?(false)+ return+ }guard force || appliedSleepPreventionRequested != requested else {completion?(true)return@@ -1128,9 +1137,13 @@ final class KeepAliveController: ObservableObject {/// 断连和超时后先断开连接并复核授权, retrying 为 nil 时只更新状态, 不重试租约private func handlePowerHelperFailure(_ message: String?, retrying requested: Bool?) {+ if let requested {+ sleepRetry.recordFailure(for: requested)+ }invalidateConnection()guard powerHelperFailureTask == nil else { return }let lifecycleGeneration = powerHelperLifecycleGeneration+ let failureGeneration = requestGenerationpowerHelperFailureTask = Task { @MainActor [weak self] inguard let self else { return }defer {@@ -1140,10 +1153,10 @@ final class KeepAliveController: ObservableObject {}guard await refreshPowerHelperStatus(), isStarted, !Task.isCancelled,powerHelperStatus == .enabled else { return }- if let message {+ if let message, requestGeneration == failureGeneration {operationErrorMessage = message}- if let requested {+ if let requested = sleepRetry.requested {scheduleRetryIfNeeded(for: requested)}}@@ -1298,7 +1311,7 @@ final class KeepAliveController: ObservableObject {retryTask?.cancel()retryTask = nil// 成功或任务结束都会走到这里, 重试预算随之重置- retryAttempt = 0+ sleepRetry = SleepPreventionRetry()}private func cancelPowerHelperRegistrationTask() {@@ -1322,7 +1335,7 @@ final class KeepAliveController: ObservableObject {// 每次重试都会重建特权连接并以 root 拉起 pmset// 限制重试次数, 避免 Power Helper 持续失败时反复拉起特权进程- guard retryAttempt < PowerHelperConfiguration.sleepToggleRetryDelays.count else {+ guard let delay = sleepRetry.nextDelay(for: requested, delays: PowerHelperConfiguration.sleepToggleRetryDelays) else {AppLog.keepAlive.error("KeepAlive 切换重试已放弃: attempts=\(PowerHelperConfiguration.sleepToggleRetryDelays.count)")@@ -1330,9 +1343,7 @@ final class KeepAliveController: ObservableObject {return}- let delay = PowerHelperConfiguration.sleepToggleRetryDelays[retryAttempt]- retryAttempt += 1- let attempt = retryAttempt+ let attempt = sleepRetry.attemptlet wait = LogDuration.seconds(delay)let details = LogFields.joined("attempt=\(attempt)",@@ -1352,7 +1363,7 @@ final class KeepAliveController: ObservableObject {return}appliedSleepPreventionRequested = nil- applySleepPreventionRequested(requested)+ applySleepPreventionRequested(requested, isRetry: true)}}diff --git a/CodexBar/Services/KeepAlive/KeepAliveModels.swift b/CodexBar/Services/KeepAlive/KeepAliveModels.swiftindex 397d69a..7ae1c4e 100644--- a/CodexBar/Services/KeepAlive/KeepAliveModels.swift+++ b/CodexBar/Services/KeepAlive/KeepAliveModels.swift@@ -1,6 +1,30 @@import Foundationimport ServiceManagement+/// 失败预算跟随期望睡眠状态, 普通快照不能替代定时重试+nonisolated struct SleepPreventionRetry {+ private(set) var requested: Bool?+ private(set) var attempt = 0++ func allowsRequest(isRetry: Bool) -> Bool {+ requested == nil || isRetry+ }++ mutating func recordFailure(for requested: Bool) {+ if self.requested != requested {+ self = Self()+ }+ self.requested = requested+ }++ mutating func nextDelay(for requested: Bool, delays: [Duration]) -> Duration? {+ recordFailure(for: requested)+ guard attempt < delays.count else { return nil }+ defer { attempt += 1 }+ return delays[attempt]+ }+}+extension KeepAliveController {/// 低电量保护阈值, rawValue 就是百分比; off 用 -1 与合法百分比区分enum LowBatteryThreshold: Int, CaseIterable, Identifiable {diff --git a/CodexBar/Services/Notifications/NotificationService.swift b/CodexBar/Services/Notifications/NotificationService.swiftindex a4adae0..5d977a7 100644--- a/CodexBar/Services/Notifications/NotificationService.swift+++ b/CodexBar/Services/Notifications/NotificationService.swift@@ -38,7 +38,7 @@ final class NotificationService: NSObject {private var cancellables = Set<AnyCancellable>()private var taskHapticFeedbackTask: Task<Void, Never>?- private var taskWaitingNotificationIdentifiers = Set<String>()+ private var taskWaitingNotificationIdentifiers: [UUID: String] = [:]private let creditExpiryReminderScheduler = ReminderCheckScheduler()private var latestQuotaSnapshot: CodexQuotaSnapshot?@@ -147,17 +147,23 @@ final class NotificationService: NSObject {return nil}let taskID = task.id- let identifier = Self.taskWaitingNotificationIdentifier(for: taskID)- taskWaitingNotificationIdentifiers.insert(identifier)+ // 同一任务的每次等待使用独立通知身份, 旧提交完成后只能撤回自己+ let identifier = "taskWaiting|\(UUID().uuidString)"+ if let previous = taskWaitingNotificationIdentifiers.updateValue(identifier, forKey: taskID) {+ removeNotifications(withIdentifiers: [previous])+ }return send(.taskWaiting(project: task.projectName, actionText: task.approvalActionText),sound: settings.taskWaitingSound,+ enabledWhen: \.isTaskWaitingEnabled,identifier: identifier,isStillRelevant: { [weak self] in- self?.activityMonitor.snapshot.blockingWaitingTaskIDs.contains(taskID) ?? false+ self?.taskWaitingNotificationIdentifiers[taskID] == identifier+ && self?.activityMonitor.snapshot.blockingWaitingTaskIDs.contains(taskID) == true},onSubmissionFailure: { [weak self] in- self?.taskWaitingNotificationIdentifiers.remove(identifier)+ guard self?.taskWaitingNotificationIdentifiers[taskID] == identifier else { return }+ self?.taskWaitingNotificationIdentifiers.removeValue(forKey: taskID)})case let .completed(completion):@@ -168,23 +174,24 @@ final class NotificationService: NSObject {}return send(.taskCompleted(project: completion.projectName, duration: duration),- sound: settings.taskCompletionSound+ sound: settings.taskCompletionSound,+ enabledWhen: \.isTaskCompletionEnabled)}}private func reconcileTaskWaitingNotifications(with snapshot: ActivitySnapshot) {- let activeIdentifiers = Set(snapshot.blockingWaitingTaskIDs.map {- Self.taskWaitingNotificationIdentifier(for: $0)- })- let obsoleteIdentifiers = taskWaitingNotificationIdentifiers.subtracting(activeIdentifiers)+ let activeTaskIDs = snapshot.blockingWaitingTaskIDs+ let obsoleteIdentifiers = taskWaitingNotificationIdentifiers.filter { !activeTaskIDs.contains($0.key) }guard !obsoleteIdentifiers.isEmpty else {return}- let identifiers = Array(obsoleteIdentifiers)+ let identifiers = Array(obsoleteIdentifiers.values)removeNotifications(withIdentifiers: identifiers)- taskWaitingNotificationIdentifiers.subtract(obsoleteIdentifiers)+ for taskID in obsoleteIdentifiers.keys {+ taskWaitingNotificationIdentifiers.removeValue(forKey: taskID)+ }}private func performTaskHapticFeedbackIfEnabled() {@@ -379,6 +386,7 @@ final class NotificationService: NSObject {thresholdPercent: lowQuota.thresholdPercent),sound: settings.lowQuotaSound,+ enabledWhen: \.isLowQuotaEnabled,dedupKey: dedupKey,onSubmissionFailure: { [weak self] inguard let self, quotaWindowObservations[stateKey]?.lifecycleToken == lifecycleToken else { return }@@ -418,9 +426,11 @@ final class NotificationService: NSObject {windowLabel: window.label),sound: settings.quotaResetSound,+ enabledWhen: \.isQuotaResetEnabled,dedupKey: dedupKey,onSubmissionFailure: { [weak self] inguard let self,+ settings.canDeliver, settings.isQuotaResetEnabled,quotaWindowObservations[stateKey]?.lifecycleToken == lifecycleToken else {return}@@ -444,6 +454,7 @@ final class NotificationService: NSObject {send(.autoResetSucceeded(remainingCount: remainingCount),sound: settings.autoResetSound,+ enabledWhen: \.isAutoResetEnabled,dedupKey: "autoResetSucceeded|\(dedupToken)")}@@ -459,6 +470,7 @@ final class NotificationService: NSObject {send(.autoResetFailed(reason: reason),sound: settings.autoResetSound,+ enabledWhen: \.isAutoResetEnabled,dedupKey: "autoResetFailed|\(dedupToken)|\(reason.rawValue)")}@@ -476,7 +488,8 @@ final class NotificationService: NSObject {return await send(.lowBattery(percent: percent),- sound: settings.lowBatterySound+ sound: settings.lowBatterySound,+ enabledWhen: \.isLowBatteryEnabled)?.value ?? false}@@ -491,7 +504,8 @@ final class NotificationService: NSObject {return await send(.keepAliveLimit(durationText: durationText),- sound: settings.keepAliveLimitSound+ sound: settings.keepAliveLimitSound,+ enabledWhen: \.isKeepAliveLimitEnabled)?.value ?? false}@@ -522,6 +536,7 @@ final class NotificationService: NSObject {send(.creditExpiry(count: groupedDates.count, expirationDate: date),sound: settings.creditExpirySound,+ enabledWhen: \.isCreditExpiryEnabled,dedupKey: dedupKey)}@@ -595,6 +610,7 @@ final class NotificationService: NSObject {private func send(_ notification: NotificationContent,sound: NotificationSoundOption,+ enabledWhen: KeyPath<NotificationSettings, Bool>? = nil,identifier: String = UUID().uuidString,dedupKey: String? = nil,isStillRelevant: (() -> Bool)? = nil,@@ -628,6 +644,7 @@ final class NotificationService: NSObject {await self?.deliver(request,kind: kind,+ enabledWhen: enabledWhen,dedupKey: dedupKey,isStillRelevant: isStillRelevant,onSubmissionFailure: onSubmissionFailure,@@ -640,6 +657,7 @@ final class NotificationService: NSObject {private func deliver(_ request: UNNotificationRequest,kind: String,+ enabledWhen: KeyPath<NotificationSettings, Bool>?,dedupKey: String?,isStillRelevant: (() -> Bool)?,onSubmissionFailure: (() -> Void)?,@@ -652,12 +670,17 @@ final class NotificationService: NSObject {}for _ in 0 ... max(0, retryCount) {+ guard settings.canDeliver, enabledWhen.map({ settings[keyPath: $0] }) ?? true else {+ onSubmissionFailure?()+ return false+ }guard isStillRelevant?() != false else {let details = LogFields.joined("kind=\(kind)","reason=obsolete")AppLog.notification.notice("通知已跳过: \(details, privacy: .public)")+ onSubmissionFailure?()return false}do {@@ -704,10 +727,6 @@ final class NotificationService: NSObject {Int(date.timeIntervalSince1970)}- private nonisolated static func taskWaitingNotificationIdentifier(for taskID: UUID) -> String {- "taskWaiting|\(taskID.uuidString)"- }-private nonisolated static func protectionNotificationIdentifier(taskID: UUID,attemptID: UUIDdiff --git a/CodexBar/Services/Settings/SyncSettings.swift b/CodexBar/Services/Settings/SyncSettings.swiftindex 5001f24..a77139b 100644--- a/CodexBar/Services/Settings/SyncSettings.swift+++ b/CodexBar/Services/Settings/SyncSettings.swift@@ -14,9 +14,10 @@ final class SyncSettings: ObservableObject {private let defaults: UserDefaultsprivate let queryAvailability: () async -> SyncAvailabilityResult- private let loadLastUpload: () -> Date?+ private let loadLastUpload: () async throws -> Date?private var cancellables = Set<AnyCancellable>()private let accountStatusCoordinator = RefreshTaskCoordinator()+ private let lastUploadCoordinator = RefreshTaskCoordinator()private var isCheckingAvailability = falseprivate var lastAvailabilityCheckAt: Date?private static let availabilityRetryInterval: TimeInterval = 60@@ -25,20 +26,20 @@ final class SyncSettings: ObservableObject {self.init(defaults: defaults,queryAvailability: { await Self.querySyncAvailability() },- loadLastUpload: Self.loadLastUploadAt+ loadLastUpload: { try await SyncService.loadLastUploadAt() })}init(defaults: UserDefaults,queryAvailability: @escaping () async -> SyncAvailabilityResult,- loadLastUpload: @escaping () -> Date?+ loadLastUpload: @escaping () async throws -> Date?) {self.defaults = defaultsself.queryAvailability = queryAvailabilityself.loadLastUpload = loadLastUploadisEnabled = Self.isEnabled(defaults: defaults)- lastUploadAt = loadLastUpload()+ refreshLastUploadAt()observeSyncNotifications()refreshSyncAvailability()}@@ -48,7 +49,7 @@ final class SyncSettings: ObservableObject {if !isEnabled {clearSyncActivity()}- lastUploadAt = loadLastUpload()+ refreshLastUploadAt()refreshSyncAvailability()}@@ -78,7 +79,7 @@ final class SyncSettings: ObservableObject {clearSyncActivity()}isEnabled = enabled- lastUploadAt = loadLastUpload()+ refreshLastUploadAt()return previousValue != enabled}@@ -160,6 +161,17 @@ final class SyncSettings: ObservableObject {clearSyncFailure()}+ private func refreshLastUploadAt() {+ lastUploadCoordinator.start { [weak self, loadLastUpload, lastUploadCoordinator] generation in+ defer { lastUploadCoordinator.finish(generation) {} }+ // 锁忙或读取失败时保留上次结果, 下次刷新再读取+ let result: Date?+ do { result = try await loadLastUpload() } catch { return }+ guard lastUploadCoordinator.canCommit(generation) else { return }+ self?.lastUploadAt = result+ }+ }+private func handleSyncDidFinish(_ notification: Notification) {let didSucceed = notification.userInfo?[SyncNotificationKey.didSucceed] as? Bool ?? truelet failureMessage = notification.userInfo?[SyncNotificationKey.failureMessage] as? String@@ -170,7 +182,7 @@ final class SyncSettings: ObservableObject {} else {applySyncFailure(failureMessage)}- lastUploadAt = loadLastUpload()+ refreshLastUploadAt()}private func applyAvailabilityResult(_ result: SyncAvailabilityResult) {@@ -211,10 +223,6 @@ final class SyncSettings: ObservableObject {}}- private nonisolated static func loadLastUploadAt() -> Date? {- SyncService.loadLastUploadAt()- }-private nonisolated static let enabledKey = "Sync.isEnabled"}diff --git a/CodexBar/Services/Sync/ActivityDataSyncStore.swift b/CodexBar/Services/Sync/ActivityDataSyncStore.swiftindex 3eacc4e..42b77fb 100644--- a/CodexBar/Services/Sync/ActivityDataSyncStore.swift+++ b/CodexBar/Services/Sync/ActivityDataSyncStore.swift@@ -12,8 +12,12 @@ nonisolated struct ActivityDataSyncStore {AppStorage(rootURL: directoryURL).lockURL(.activityDataSyncCache)}- func load() throws -> ActivityDataSyncCache {- try JSONFileStorage.withLock(at: lockURL) { try read() }+ func load(nonblocking: Bool = false) throws -> ActivityDataSyncCache {+ guard let lock = try JSONFileStorage.acquireLock(at: lockURL, nonblocking: nonblocking) else {+ throw POSIXError(.EWOULDBLOCK)+ }+ defer { JSONFileStorage.releaseLock(lock) }+ return try read()}func loadState() -> ActivityDataSyncState {diff --git a/CodexBar/Services/Sync/SyncService.swift b/CodexBar/Services/Sync/SyncService.swiftindex 6f58419..e56d4d2 100644--- a/CodexBar/Services/Sync/SyncService.swift+++ b/CodexBar/Services/Sync/SyncService.swift@@ -818,8 +818,9 @@ private extension SyncService {extension SyncService {/// 设置页读取最近上传时间时, 与内部 loadState 使用相同的 schemaVersion 校验规则- nonisolated static func loadLastUploadAt() -> Date? {- ActivityDataSyncStore(directoryURL: AppStorage.directoryURL()).loadState().lastUploadAt+ @concurrent nonisolated static func loadLastUploadAt(in directoryURL: URL = AppStorage.directoryURL()) async throws -> Date? {+ try Task.checkCancellation()+ return try ActivityDataSyncStore(directoryURL: directoryURL).load(nonblocking: true).state.lastUploadAt}}diff --git a/CodexBar/Services/Sync/TokenUsageSync.swift b/CodexBar/Services/Sync/TokenUsageSync.swiftindex bc5ea27..6b312be 100644--- a/CodexBar/Services/Sync/TokenUsageSync.swift+++ b/CodexBar/Services/Sync/TokenUsageSync.swift@@ -263,9 +263,12 @@ nonisolated extension SyncCache where Record == TokenUsageSyncRecord, State == Tlet cutoff = HistoryStorage.dateKey(for: HistoryStorage.retentionCutoffDate(today: now))let retained = records.filter { $0.value.date >= cutoff }guard retained.count != records.count else { return false }+ let hasExpiredLocalRecords = records.values.contains { $0.deviceID == state.deviceID && $0.date < cutoff }records = retained- // 本地先过期, 云端删除仍可能失败. 下次完整拉取让过期记录重新进入删除流程- cursor = nil+ // 只有本机旧记录需要重新拉取以重试云端删除, 其他设备不由本机清理+ if hasExpiredLocalRecords {+ cursor = nil+ }return true}}diff --git a/Config/BuildNumber.xcconfig b/Config/BuildNumber.xcconfigindex 46740ff..7f82ff6 100644--- a/Config/BuildNumber.xcconfig+++ b/Config/BuildNumber.xcconfig@@ -1,3 +1,3 @@// 请勿手动修改// Do not modify manually-CURRENT_PROJECT_VERSION = 381\ No newline at end of file+CURRENT_PROJECT_VERSION = 382\ No newline at end of filediff --git a/Tests/App/KeepAlive/SleepPreventionRetryTests.swift b/Tests/App/KeepAlive/SleepPreventionRetryTests.swiftnew file mode 100644index 0000000..b6fa463--- /dev/null+++ b/Tests/App/KeepAlive/SleepPreventionRetryTests.swift@@ -0,0 +1,48 @@+import Foundation+import Testing++struct SleepPreventionRetryTests {+ @Test(arguments: [false, true])+ func activityUpdatesCannotBypassBackoffOrExhaustedBudget(requested: Bool) {+ var retry = SleepPreventionRetry()+ let delays: [Duration] = [.seconds(2), .seconds(4)]+ #expect(retry.allowsRequest(isRetry: false))+ retry.recordFailure(for: requested)+ for delay in delays {+ for _ in 0 ..< 50 {+ #expect(!retry.allowsRequest(isRetry: false))+ }+ let scheduledDelay = retry.nextDelay(for: requested, delays: delays)+ #expect(scheduledDelay == delay)+ #expect(retry.allowsRequest(isRetry: true))+ retry.recordFailure(for: requested)+ }+ let exhaustedDelay = retry.nextDelay(for: requested, delays: delays)+ #expect(exhaustedDelay == nil)+ for _ in 0 ..< 50 {+ #expect(!retry.allowsRequest(isRetry: false))+ }+ #expect(retry.requested == requested)+ #expect(retry.attempt == delays.count)+ }++ @Test(arguments: [false, true])+ func changedFailureTargetStartsFreshBudget(requested: Bool) {+ var retry = SleepPreventionRetry()+ let delays: [Duration] = [.seconds(2)]+ let firstDelay = retry.nextDelay(for: requested, delays: delays)+ #expect(firstDelay == .seconds(2))+ retry.recordFailure(for: requested)+ let exhaustedDelay = retry.nextDelay(for: requested, delays: delays)+ #expect(exhaustedDelay == nil)+ #expect(!retry.allowsRequest(isRetry: false))++ retry.recordFailure(for: !requested)+ #expect(retry.requested == !requested)+ #expect(retry.attempt == 0)+ #expect(!retry.allowsRequest(isRetry: false))+ let changedTargetDelay = retry.nextDelay(for: !requested, delays: delays)+ #expect(changedTargetDelay == .seconds(2))+ #expect(retry.attempt == 1)+ }+}diff --git a/Tests/App/Notifications/TaskWaitingNotificationTests.swift b/Tests/App/Notifications/TaskWaitingNotificationTests.swiftindex 633b98d..a56d87f 100644--- a/Tests/App/Notifications/TaskWaitingNotificationTests.swift+++ b/Tests/App/Notifications/TaskWaitingNotificationTests.swift@@ -4,6 +4,61 @@ import UserNotifications@Suite(.tags(.integration))struct TaskWaitingNotificationTests {+ @Test(arguments: [false, true])+ func disablingNotificationsDuringFailedSubmissionStopsRetry(categoryOnly: Bool) async throws {+ let fixture = try Fixture()+ defer { fixture.cleanUp() }+ try await fixture.start()+ fixture.delivery.suspendsSubmissions = true+ let submission = try fixture.enterWaiting(blockingInput: false)+ try #require(try await waitForCondition(timeout: .seconds(2), pollInterval: .milliseconds(5)) { fixture.delivery.hasPendingSubmission })+ if categoryOnly {+ fixture.settings.setTaskWaitingEnabled(false)+ } else {+ fixture.settings.setEnabled(false)+ }+ fixture.delivery.resumeSubmission(failing: true)+ #expect(await submission.value == false)+ #expect(fixture.delivery.attempts.count == 1)+ #expect(fixture.delivery.delivered.isEmpty)+ try fixture.resolveWaiting()+ #expect(fixture.delivery.removals.isEmpty)++ fixture.settings.setTaskWaitingEnabled(true)+ fixture.settings.setEnabled(true)+ try #require(try await waitForCondition(timeout: .seconds(2), pollInterval: .milliseconds(5)) { fixture.settings.canDeliver })+ fixture.delivery.suspendsSubmissions = false+ let next = try fixture.enterWaiting(blockingInput: false)+ #expect(await next.value)+ try fixture.resolveWaiting()+ #expect(fixture.delivery.delivered.isEmpty)+ }++ @Test(arguments: [false, true])+ func oldWaitingSubmissionCannotOverwriteOrUntrackTheNextWait(oldFails: Bool) async throws {+ let fixture = try Fixture()+ defer { fixture.cleanUp() }+ try await fixture.start()+ fixture.delivery.suspendsSubmissions = true+ let first = try fixture.enterWaiting(blockingInput: false)+ try #require(try await waitForCondition(timeout: .seconds(2), pollInterval: .milliseconds(5)) { fixture.delivery.attempts.count == 1 })+ let firstID = fixture.identifier+ try fixture.resolveWaiting()+ let second = try fixture.enterWaiting(blockingInput: true)+ try #require(try await waitForCondition(timeout: .seconds(2), pollInterval: .milliseconds(5)) { fixture.delivery.attempts.count == 2 })+ let secondID = fixture.identifier+ #expect(firstID != secondID)+ fixture.delivery.resumeSubmission(at: 1)+ #expect(await second.value)+ fixture.delivery.resumeSubmission(failing: oldFails)+ #expect(await first.value == false)+ #expect(fixture.delivery.attempts.count == 2)+ #expect(fixture.delivery.delivered == [secondID])+ try fixture.resolveWaiting()+ #expect(fixture.delivery.delivered.isEmpty)+ #expect(fixture.delivery.removals.last == [secondID])+ }+@Test(arguments: [false, true])func monitorTransitionDeliversAndSnapshotWithdrawsNotification(blockingInput: Bool) async throws {let fixture = try Fixture()@@ -112,7 +167,7 @@ private final class Fixture {private var graph = ActivityTaskGraph()var identifier: String {- "taskWaiting|\(taskID.uuidString)"+ delivery.attempts.last ?? delivery.removals.first?.first ?? "not-submitted"}init() throws {@@ -199,10 +254,10 @@ private final class TestNotificationDelivery {private(set) var attempts: [String] = []private(set) var delivered = Set<String>()private(set) var removals: [Set<String>] = []- private var pending: CheckedContinuation<Void, any Error>?+ private var pending: [CheckedContinuation<Void, any Error>] = []var hasPendingSubmission: Bool {- pending != nil+ !pending.isEmpty}var client: NotificationService.Delivery {@@ -211,7 +266,7 @@ private final class TestNotificationDelivery {add: { [self] request inattempts.append(request.identifier)if suspendsSubmissions {- try await withCheckedThrowingContinuation { pending = $0 }+ try await withCheckedThrowingContinuation { pending.append($0) }}if failuresRemaining > 0 {failuresRemaining -= 1@@ -226,17 +281,22 @@ private final class TestNotificationDelivery {)}- func resumeSubmission() {- let continuation = pending- pending = nil- continuation?.resume()+ func resumeSubmission(at index: Int = 0, failing: Bool = false) {+ let continuation = pending.remove(at: index)+ if failing {+ continuation.resume(throwing: CocoaError(.fileWriteUnknown))+ } else {+ continuation.resume()+ }}func cancelPendingSubmissions() {suspendsSubmissions = falsefailuresRemaining = 2- let continuation = pending- pending = nil- continuation?.resume(throwing: CancellationError())+ let continuations = pending+ pending.removeAll()+ for continuation in continuations {+ continuation.resume(throwing: CancellationError())+ }}}diff --git a/Tests/App/Presentation/WindowAnimationTests.swift b/Tests/App/Presentation/WindowAnimationTests.swiftnew file mode 100644index 0000000..9cba298--- /dev/null+++ b/Tests/App/Presentation/WindowAnimationTests.swift@@ -0,0 +1,42 @@+import AppKit+import Testing++struct WindowAnimationTests {+ @Test func disabledDrawerAnimationClearsOldTransformAndCompletesImmediately() {+ let view = NSView(frame: NSRect(x: 0, y: 0, width: 100, height: 100))+ view.wantsLayer = true+ let animationKey = "test.drawer"+ let animator = SidePanelDrawerAnimator(+ contentViewProvider: { view }, animationKey: animationKey,+ overscan: 0, areAnimationsEnabled: { false }+ )+ animator.setTranslation(100)+ view.layer?.add(CABasicAnimation(keyPath: "transform"), forKey: animationKey)+ var completions = 0+ animator.animateTranslation(to: 0, duration: 1, timing: .easeOut) { completions += 1 }+ #expect(completions == 1)+ #expect(view.layer?.animation(forKey: animationKey) == nil)+ #expect(view.layer?.transform.m41 == 0)+ #expect(view.window == nil)+ }++ @Test func immediateFadeInCancelsOldOpeningAndClosingCompletions() async throws {+ let view = NSView(frame: NSRect(x: 0, y: 0, width: 100, height: 100))+ var closes = 0+ var oldCompletions = 0+ var completions = 0+ let coordinator = MenuSurfaceFadeCoordinator(contentViewProvider: { view }, closeActiveMenuSurface: { closes += 1 })+ coordinator.fadeIn(duration: 0.01) { oldCompletions += 1 }+ coordinator.fadeIn(duration: 0) { completions += 1 }+ #expect(view.alphaValue == 1)+ #expect(completions == 1)+ #expect(coordinator.fadeOut(duration: 0.01) { oldCompletions += 1 })+ coordinator.fadeIn(duration: 0) { completions += 1 }+ #expect(completions == 2)+ try await Task.sleep(for: .milliseconds(30))+ #expect(oldCompletions == 0)+ #expect(closes == 0)+ #expect(view.alphaValue == 1)+ #expect(view.window == nil)+ }+}diff --git a/Tests/App/Sync/ActivityDataSyncStoreTests.swift b/Tests/App/Sync/ActivityDataSyncStoreTests.swiftindex 2ba25ae..c9ad61a 100644--- a/Tests/App/Sync/ActivityDataSyncStoreTests.swift+++ b/Tests/App/Sync/ActivityDataSyncStoreTests.swift@@ -3,6 +3,20 @@ import Testing@Suite(.tags(.integration))struct ActivityDataSyncStoreTests {+ @Test func uploadTimeReadDoesNotWaitForCacheWriter() async throws {+ let directory = try TestDirectory()+ defer { try? directory.remove() }+ let store = ActivityDataSyncStore(directoryURL: directory.url)+ let uploadedAt = JSONLines.storageDate(Date())+ try store.saveState(ActivityDataSyncState(lastUploadAt: uploadedAt))+ do {+ let lock = try #require(try JSONFileStorage.acquireLock(at: AppStorage(rootURL: directory.url).lockURL(.activityDataSyncCache)))+ defer { JSONFileStorage.releaseLock(lock) }+ await #expect(throws: POSIXError.self) { try await SyncService.loadLastUploadAt(in: directory.url) }+ }+ #expect(try await SyncService.loadLastUploadAt(in: directory.url) == uploadedAt)+ }+@Test func activityDataCacheCommitsRecordsAndCursorTogether() throws {let directory = try TestDirectory()defer { try? directory.remove() }diff --git a/Tests/App/Sync/SyncAvailabilityTests.swift b/Tests/App/Sync/SyncAvailabilityTests.swiftindex 907f799..b763134 100644--- a/Tests/App/Sync/SyncAvailabilityTests.swift+++ b/Tests/App/Sync/SyncAvailabilityTests.swift@@ -3,6 +3,30 @@ import Foundationimport Testingstruct SyncAvailabilityTests {+ @Test func uploadTimeIgnoresOlderReadsAndPreservesValueAfterFailure() async throws {+ let preferences = try TestPreferences()+ defer { preferences.remove() }+ var reads: [CheckedContinuation<Date?, any Error>] = []+ let settings = SyncSettings(defaults: preferences.defaults, queryAvailability: { .available }, loadLastUpload: {+ try await withCheckedThrowingContinuation { reads.append($0) }+ })+ try await waitUntil { reads.count == 1 }+ settings.refresh()+ try await waitUntil { reads.count == 2 }+ let latest = Date(timeIntervalSince1970: 200)+ reads[1].resume(returning: latest)+ try await waitUntil { settings.lastUploadAt == latest }+ reads[0].resume(returning: Date(timeIntervalSince1970: 100))+ settings.refresh()+ try await waitUntil { reads.count == 3 }+ reads[2].resume(throwing: POSIXError(.EWOULDBLOCK))+ settings.refresh()+ try await waitUntil { reads.count == 4 }+ #expect(settings.lastUploadAt == latest)+ reads[3].resume(returning: nil)+ try await waitUntil { settings.lastUploadAt == nil }+ }+@Test func maintenanceRecoversAvailabilityWithoutOpeningSettings() async throws {let preferences = try TestPreferences()defer { preferences.remove() }diff --git a/Tests/App/Sync/SyncRecoveryTests.swift b/Tests/App/Sync/SyncRecoveryTests.swiftindex 164982b..30729f7 100644--- a/Tests/App/Sync/SyncRecoveryTests.swift+++ b/Tests/App/Sync/SyncRecoveryTests.swift@@ -4,6 +4,27 @@ import Testing@Suite(.tags(.integration))struct SyncRecoveryTests {+ @Test(arguments: [false, true])+ func expiredRemoteRecordsKeepCursorWhileLocalRecordsRequireDeletionRetry(local: Bool) throws {+ let now = Date()+ let expiredDate = HistoryStorage.dateKey(for: HistoryStorage.retentionCutoffDate(today: now).addingTimeInterval(-86400))+ let current = TokenUsageSyncRecord(deviceID: "device", date: HistoryStorage.dateKey(for: now), tokenUsage: .zero)+ let expired = TokenUsageSyncRecord(deviceID: local ? "device" : "offline-device", date: expiredDate, tokenUsage: .zero)+ let cursor = Data("saved-server-cursor".utf8)+ var cache = TokenUsageSyncCache(state: TokenUsageSyncState(deviceID: "device"))+ cache.records = [current.id: current, expired.id: expired]+ cache.cursor = cursor+ let didPrune = cache.prune(now: now)+ #expect(didPrune)+ #expect(cache.records == [current.id: current])+ #expect(cache.cursor == (local ? nil : cursor))+ let reopened = try JSONLines.decoder.decode(TokenUsageSyncCache.self, from: JSONLines.stableEncoder.encode(cache))+ #expect(reopened == cache)+ let prunedAgain = cache.prune(now: now)+ #expect(!prunedAgain)+ #expect(cache.cursor == (local ? nil : cursor))+ }+@Test func expiredTokenUsageCacheStaysBoundedWhenCloudDeletionFailsAndRetries() async throws {let directory = try TestDirectory()defer { try? directory.remove() }