Merge remote-tracking branch 'upstream/main' into pr2524-work

# Conflicts:
#	CHANGELOG.md

Author: LeoLin

CHANGELOG.md

@@ -4,10 +4,17 @@
 
 ### Added
 - z.ai: add 7-day and 30-day model-usage chart ranges with dataset-consistent legends, colors, and daily tooltips (#2524). Thanks @LeoLin990405!
+- Refresh: add a default-off global Low Power Mode that limits automatic provider, local usage, and storage work to once every 30 minutes while keeping manual refresh immediate (#2518). Thanks @Carl723000!
+- CLI: `codexbar hooks watch` continuously polls providers and fires hooks on real quota/status transitions for headless installs, with in-memory baselines, event rate limits, `--interval` (default 300s, minimum 60s), `--provider`, and JSON output (#2536). Thanks @OfficialAbhinavSingh!
 - Claude: compact multi-account menu for claude-swap — with four or more accounts the active account keeps its full card while the others become one-line rows sorted by remaining headroom, constrained accounts surface in red/amber, the healthiest switch target gets a star, and the healthy tail folds behind a summary row. Click a row to expand its full card.
 - Menu: the compact multi-account layout now covers every stacked multi-account list — token accounts on any provider and Codex accounts (flat lists; workspace-grouped Codex lists keep their sections).
+- Menu bar: Session/Weekly/Auto pace layout tokens that render the signed pace delta (`+11%`, `-8%`, `0%`), restoring the pre-0.45 "Both" display in the layout editor (#2540, fixes #2534). Thanks @kratocz!
 
 ### Fixed
+- Doubao: show Agent Plan windows alongside Coding Plan usage for Volcengine AK/SK accounts that subscribe to both products (#2517). Thanks @Astro-Han!
+- Augment: store session cookies owner-only (0600), atomically publish updates, and repair permissions on legacy files (#2567).
+- Ollama: direct declined Chrome Keychain access recovery to the provider card's Refresh (⌘R) action instead of the ambiguous manual-cookie path (#2072).
+- Menu: switching from a tall Overview to a shorter provider now shrinks the menu instead of stretching the provider-height spacer into a large blank region.
 - Codex: persist and budget fork-parent discovery so missing parents quiesce between inventory changes instead of sweeping every rollout on each refresh (#2525, #2538). Thanks @xx205, and @Helmi and @kiranmagic7 for the investigation!
 - Claude: Auto cold boot with Keychain disabled loads without manual refresh (#2494, fixes #2493). Thanks @gmkbenjamin!
 - Menu: no more stray floating "Refresh" tooltip beside the menu when switching tabs with the cursor over the actions area.

Package.resolved

@@ -8,7 +8,7 @@ let useLocalSweetCookieKit =
 let sweetCookieKitDependency: Package.Dependency =
     useLocalSweetCookieKit && FileManager.default.fileExists(atPath: sweetCookieKitPath)
     ? .package(path: sweetCookieKitPath)
-    : .package(url: "https://github.com/steipete/SweetCookieKit", from: "0.4.1")
+    : .package(url: "https://github.com/steipete/SweetCookieKit", from: "0.5.1")
 
 let sqlite3LibDir = ProcessInfo.processInfo.environment["CODEXBAR_SQLITE3_LIB_DIR"]?
     .trimmingCharacters(in: .whitespacesAndNewlines)

Package.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+enum BackgroundWorkPowerPolicy {
+    static let lowPowerMinimumInterval: TimeInterval = 30 * 60
+
+    static func automaticInterval(
+        _ requested: TimeInterval?,
+        lowPowerModeEnabled: Bool) -> TimeInterval?
+    {
+        guard let requested else { return nil }
+        guard lowPowerModeEnabled else { return requested }
+        return max(requested, self.lowPowerMinimumInterval)
+    }
+}

Sources/CodexBar/BackgroundWorkPowerPolicy.swift

@@ -12,6 +12,9 @@ enum MenuBarLayoutToken: Codable, Hashable, Sendable {
     case providerName
     case accountLabel
     case percent(window: PercentWindow)
+    /// Signed pace delta for a window, e.g. `+11%` when usage runs ahead of the sustainable rate.
+    /// `runsOut` answers "when does this end"; this token answers "how far off the even rate am I".
+    case pace(window: PercentWindow)
     case usageBar
     case resetCountdown
     case resetAbsolute

Sources/CodexBar/MenuBarLayout.swift

@@ -246,6 +246,9 @@ struct MenuBarLayoutEditor: View {
                     .percent(window: .weekly),
                     .percent(window: .automatic),
                     .usageBar,
+                    .pace(window: .session),
+                    .pace(window: .weekly),
+                    .pace(window: .automatic),
                 ],
                 includesLineBreak: false),
             MenuBarLayoutPaletteGroup(
@@ -686,6 +689,9 @@ private struct MenuBarLayoutPreview: View {
             session: MenuBarLayoutRenderWindow(session),
             weekly: MenuBarLayoutRenderWindow(weekly),
             automatic: MenuBarLayoutRenderWindow(automatic),
+            sessionPace: self.store.menuBarLayoutPaceText(provider: provider, window: session, now: now),
+            weeklyPace: self.store.menuBarLayoutPaceText(provider: provider, window: weekly, now: now),
+            automaticPace: self.store.menuBarLayoutPaceText(provider: provider, window: automatic, now: now),
             runsOut: runsOut,
             costToday: costToday.map {
                 UsageFormatter.currencyString($0, currencyCode: cost?.currencyCode ?? "USD")
@@ -707,13 +713,21 @@ private struct MenuBarLayoutPreview: View {
             windowMinutes: 10080,
             resetsAt: now.addingTimeInterval(3 * 24 * 60 * 60),
             resetDescription: nil)
+        // Sample pace comes straight from the pure calculation rather than the store, so the palette
+        // preview stays deterministic before any snapshot has been fetched.
+        let samplePace = { (window: RateWindow) -> String? in
+            MenuBarDisplayText.paceText(pace: UsagePace.weekly(window: window, now: now))
+        }
         return MenuBarLayoutRenderData(
             iconKey: "\(provider.rawValue)-representative",
             providerName: L(self.store.metadata(for: provider).displayName),
             accountLabel: self.settings.hidePersonalInfo ? nil : L("menu_bar_layout_sample_account"),
             session: MenuBarLayoutRenderWindow(session),
             weekly: MenuBarLayoutRenderWindow(weekly),
             automatic: MenuBarLayoutRenderWindow(session),
+            sessionPace: samplePace(session),
+            weeklyPace: samplePace(weekly),
+            automaticPace: samplePace(session),
             runsOut: L("menu_bar_layout_sample_runs_out"),
             costToday: "$1.25",
             cost30d: "$20.00")
@@ -778,6 +792,9 @@ extension MenuBarLayoutToken {
         case .percent(window: .session): L("menu_bar_layout_token_session")
         case .percent(window: .weekly): L("menu_bar_layout_token_weekly")
         case .percent(window: .automatic): L("menu_bar_layout_token_auto")
+        case .pace(window: .session): L("menu_bar_layout_token_session_pace")
+        case .pace(window: .weekly): L("menu_bar_layout_token_weekly_pace")
+        case .pace(window: .automatic): L("menu_bar_layout_token_auto_pace")
         case .usageBar: L("menu_bar_layout_token_bar")
         case .resetCountdown: L("menu_bar_layout_token_resets_in")
         case .resetAbsolute: L("menu_bar_layout_token_reset_at")
@@ -802,6 +819,7 @@ extension MenuBarLayoutToken {
         case .providerName: "textformat"
         case .accountLabel: "person.crop.circle"
         case .percent: "percent"
+        case .pace: "speedometer"
         case .usageBar: "chart.bar.fill"
         case .resetCountdown: "timer"
         case .resetAbsolute: "clock"

Sources/CodexBar/MenuBarLayoutEditor.swift

@@ -28,6 +28,12 @@ struct MenuBarLayoutRenderData: Hashable {
     let session: MenuBarLayoutRenderWindow?
     let weekly: MenuBarLayoutRenderWindow?
     let automatic: MenuBarLayoutRenderWindow?
+    /// Signed pace deltas per window, already formatted (`+11%`, `-8%`, `0%`). Pace needs the store's
+    /// historical dataset and work-day setting, so it is resolved upstream like `runsOut` rather than
+    /// derived from the render windows here.
+    let sessionPace: String?
+    let weeklyPace: String?
+    let automaticPace: String?
     let runsOut: String?
     let costToday: String?
     let cost30d: String?
@@ -249,6 +255,12 @@ final class MenuBarLayoutRenderer {
                 ? L("%@ unavailable", accessibilityPrefix)
                 : L("%@ %@", accessibilityPrefix, value)
             return self.textToken(display, accessibilityText: accessibility, attributes: style.attributes)
+        case let .pace(window):
+            return self.optionalTextToken(
+                Self.pace(window, data: data),
+                unavailableLabel: L("%@ unavailable", Self.paceAccessibilityPrefix(window)),
+                accessibilityPrefix: Self.paceAccessibilityPrefix(window),
+                attributes: style.attributes)
         case .usageBar:
             guard let window = data.automatic else {
                 return self.textToken(
@@ -361,6 +373,26 @@ final class MenuBarLayoutRenderer {
         }
     }
 
+    private static func pace(
+        _ percentWindow: PercentWindow,
+        data: MenuBarLayoutRenderData)
+        -> String?
+    {
+        switch percentWindow {
+        case .session: data.sessionPace
+        case .weekly: data.weeklyPace
+        case .automatic: data.automaticPace
+        }
+    }
+
+    private static func paceAccessibilityPrefix(_ percentWindow: PercentWindow) -> String {
+        switch percentWindow {
+        case .session: L("menu_bar_layout_token_session_pace")
+        case .weekly: L("menu_bar_layout_token_weekly_pace")
+        case .automatic: L("menu_bar_layout_token_auto_pace")
+        }
+    }
+
     private static func sessionPrefix(_ window: MenuBarLayoutRenderWindow?) -> String {
         guard let minutes = window?.windowMinutes, minutes > 0 else { return "S" }
         guard minutes.isMultiple(of: 60) else { return "\(minutes)m" }

Sources/CodexBar/MenuBarLayoutRenderer.swift

@@ -174,6 +174,14 @@ struct GeneralPane: View {
 
                 Toggle(L("refresh_on_open_title"), isOn: self.$settings.refreshAllProvidersOnMenuOpen)
 
+                Toggle(isOn: self.$settings.backgroundWorkLowPowerModeEnabled) {
+                    SettingsRowLabel(
+                        L("Low Power Mode"),
+                        subtitle: L(
+                            "Runs automatic provider, local usage, and storage refreshes no more often than every " +
+                                "30 minutes. Manual refresh remains available."))
+                }
+
                 Toggle(isOn: self.$settings.statusChecksEnabled) {
                     SettingsRowLabel(
                         L("check_provider_status_title"),

Sources/CodexBar/PreferencesGeneralPane.swift

@@ -134,7 +134,7 @@ struct CodexProviderImplementation: ProviderImplementation {
                 onAppearWhenEnabled: nil),
             ProviderSettingsToggleDescriptor(
                 id: "codex-openai-web-battery-saver",
-                title: "Battery Saver",
+                title: "OpenAI web battery saver",
                 subtitle: [
                     "Limits background chatgpt.com refreshes to reduce battery and network usage.",
                     "Dashboard extras may stay stale until you refresh them manually.",

Sources/CodexBar/Providers/Codex/CodexProviderImplementation.swift

@@ -15,7 +15,8 @@ struct OllamaUIErrorMapper {
         }
         if let browserName = self.browserName(
             in: trimmed,
-            suffix: " cookie decryption was declined in Keychain; retry with a manual refresh.")
+            suffix: " cookie decryption was declined in Keychain. " +
+                "Open the provider card and click Refresh (⌘R) to request Keychain access again.")
         {
             return String(format: localize("ollama_browser_cookie_decryption_denied"), browserName)
         }