chore: merge main into scoped weekly token

Co-authored-by: Luca Campanella <luca.campanella1@gmail.com>

Author: Peter Steinberger

CHANGELOG.md

@@ -3,13 +3,26 @@
 ## 0.46.1 — Unreleased
 
 ### Added
+- Notion AI: add Business and Enterprise workspace allowance tracking for rolling and billing-period windows (#2552). Thanks @n0ah37!
+- Notion AI: pace estimates on both the rolling and billing-period bars, scored against the real calendar month ending at the reset rather than a flat 30 days (#2552). Thanks @n0ah37!
+- Sync: opt-in iCloud sync (Settings → iCloud Sync, default off) syncs provider configuration, a curated preferences subset, and per-device usage snapshots across Macs via CloudKit; API keys/cookies/tokens ride end-to-end-encrypted fields with their own opt-out, hooks and machine-local paths never sync, and menus can show accounts from other Macs with last-known usage ("via <Mac> · 1h ago") when the local fetch is unavailable. The app now also watches `config.json`, so external CLI edits apply live.
+- 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!
 - Menu bar: model-scoped weekly percentage layout token, labeled from the active carve-out while keeping the persistent editor vocabulary model-generic (#2440, addresses #2360). Thanks @lucacampanella!
 
 ### Fixed
+- Notion AI: `codexbar` now honors the provider's Workspace ID, manual cookie header, and `off` source instead of always auto-selecting a workspace (#2552). Thanks @n0ah37!
+- Providers with monthly billing windows (Notion AI, Amp, MiMo, StepFun, Doubao, Alibaba, OpenCode Go): the menu bar's pace token, the "runs out" estimate, and predictive pace warnings now measure the real calendar cycle, matching the card and the CLI instead of scoring every period as a flat 30 days (#2552). Thanks @n0ah37!
+- Cursor: make on-demand extra usage follow the shared optional-usage setting and remove the unsupported credits placeholder (#2338). Thanks @Zihao-Qi!
+- Antigravity/Sessions: inspect processes in-process via libproc instead of spawning full-system ps/lsof, eliminating repeated macOS 26 “access data from other apps” prompts (#2267 hardening).
+- 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: merged provider tabs now size to their own content when switching from Overview instead of padding every tab to the tallest provider and leaving large blank regions.
 - 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.
@@ -30,6 +43,9 @@
 ### Changed
 - About: link the Website entry to codex.bar.
 
+### Fixed
+- Alibaba: authenticate mainland and international personal Token Plans without a captured Teams workspace, preserve valid sessions on gateway permission errors, and forward optional security tokens (#2533, fixes #2500, #2349, and #2370). Thanks @wait2050!
+
 ## 0.46.0 — 2026-07-29
 
 ### Added

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

@@ -9,7 +9,7 @@
 [![License: MIT](https://img.shields.io/badge/license-MIT-6e5aff?style=flat-square)](LICENSE)
 [![Site](https://img.shields.io/badge/site-codexbar.app-16d3b4?style=flat-square)](https://codexbar.app)
 
-<a href="https://codexbar.app"><img src="docs/social.png" alt="CodexBar — every AI coding limit in your menu bar. 66 providers." width="100%" /></a>
+<a href="https://codexbar.app"><img src="docs/social.png" alt="CodexBar — every AI coding limit in your menu bar. 67 providers." width="100%" /></a>
 
 Tiny macOS 14+ menu bar app that keeps **AI coding-provider limits visible** and shows when each window resets. Codex, OpenAI, Claude, Cursor, Gemini, Copilot, Grok, GroqCloud, ElevenLabs, Deepgram, z.ai, MiniMax, Kiro, Zed, Vertex AI, Augment, OpenRouter, LiteLLM, LLM Proxy, Codebuff, Command Code, ClinePass, AWS Bedrock, and many newer coding providers. One status item per provider, or Merge Icons mode with a provider switcher. No Dock icon, minimal UI, dynamic bar icons.
 

README.md

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Deploys the CodexBar CloudKit schema (Scripts/cloudkit/schema.ckdb).
+#
+# Requires a CloudKit management token (create one at
+# https://icloud.developer.apple.com/dashboard → account menu → Tokens,
+# or via `xcrun cktool save-token`). Pass it via CLOUDKIT_MANAGEMENT_TOKEN
+# or save it first with `xcrun cktool save-token`.
+#
+# Usage: Scripts/cloudkit/deploy_schema.sh [development|production]
+set -euo pipefail
+
+ENVIRONMENT="${1:-development}"
+case "$ENVIRONMENT" in
+  development|production) ;;
+  *) echo "ERROR: environment must be development or production" >&2; exit 1 ;;
+esac
+
+TEAM_ID="Y5PE65HELJ"
+CONTAINER_ID="iCloud.com.steipete.codexbar"
+SCHEMA_FILE="$(cd "$(dirname "$0")" && pwd)/schema.ckdb"
+
+TOKEN_ARGS=()
+if [[ -n "${CLOUDKIT_MANAGEMENT_TOKEN:-}" ]]; then
+  TOKEN_ARGS=(--token "$CLOUDKIT_MANAGEMENT_TOKEN")
+fi
+
+echo "Validating schema against $ENVIRONMENT..."
+xcrun cktool validate-schema ${TOKEN_ARGS[@]+"${TOKEN_ARGS[@]}"} \
+  --team-id "$TEAM_ID" --container-id "$CONTAINER_ID" \
+  --environment "$ENVIRONMENT" --file "$SCHEMA_FILE"
+
+echo "Importing schema into $ENVIRONMENT..."
+xcrun cktool import-schema ${TOKEN_ARGS[@]+"${TOKEN_ARGS[@]}"} \
+  --team-id "$TEAM_ID" --container-id "$CONTAINER_ID" \
+  --environment "$ENVIRONMENT" --file "$SCHEMA_FILE"
+
+echo "Done. Current $ENVIRONMENT schema:"
+xcrun cktool export-schema ${TOKEN_ARGS[@]+"${TOKEN_ARGS[@]}"} \
+  --team-id "$TEAM_ID" --container-id "$CONTAINER_ID" \
+  --environment "$ENVIRONMENT"

Scripts/cloudkit/deploy_schema.sh

@@ -0,0 +1,51 @@
+DEFINE SCHEMA
+
+    RECORD TYPE AccountSnapshot (
+        accountKey       STRING,
+        deviceID         STRING,
+        fetchedAt        TIMESTAMP,
+        provider         STRING,
+        schemaVersion    INT64,
+        displayLabel     ENCRYPTED STRING,
+        usagePayload     ENCRYPTED STRING,
+        GRANT WRITE TO "_creator",
+        GRANT CREATE TO "_icloud",
+        GRANT READ TO "_creator"
+    );
+
+    RECORD TYPE Device (
+        appVersion       STRING,
+        deviceID         STRING,
+        hostName         STRING,
+        lastSeen         TIMESTAMP,
+        model            STRING,
+        schemaVersion    INT64,
+        GRANT WRITE TO "_creator",
+        GRANT CREATE TO "_icloud",
+        GRANT READ TO "_creator"
+    );
+
+    RECORD TYPE Preferences (
+        editCount        INT64,
+        modifiedAt       TIMESTAMP,
+        payload          STRING,
+        schemaVersion    INT64,
+        GRANT WRITE TO "_creator",
+        GRANT CREATE TO "_icloud",
+        GRANT READ TO "_creator"
+    );
+
+    RECORD TYPE ProviderIntent (
+        editCount        INT64,
+        modifiedAt       TIMESTAMP,
+        payload          STRING,
+        provider         STRING,
+        schemaVersion    INT64,
+        apiKey           ENCRYPTED STRING,
+        cookieHeader     ENCRYPTED STRING,
+        secretKey        ENCRYPTED STRING,
+        tokenAccounts    ENCRYPTED STRING,
+        GRANT WRITE TO "_creator",
+        GRANT CREATE TO "_icloud",
+        GRANT READ TO "_creator"
+    );

Scripts/cloudkit/schema.ckdb

@@ -242,6 +242,36 @@ if [[ "$ALLOW_LLDB" == "1" && "$LOWER_CONF" != "debug" ]]; then
   echo "ERROR: CODEXBAR_ALLOW_LLDB requires debug configuration" >&2
   exit 1
 fi
+# iCloud sync (CloudKit) requires restricted entitlements authorized by an embedded
+# Developer ID provisioning profile. Only identity-signed release builds of the primary
+# bundle ID carry them; adhoc/debug builds run with sync unavailable.
+PROVISIONING_PROFILE_SOURCE="$ROOT/Scripts/profiles/CodexBar-DeveloperID.provisionprofile"
+EMBED_PROVISIONING_PROFILE=0
+ICLOUD_ENTITLEMENT_KEYS=""
+if [[ "$SIGNING_MODE" == "identity" && "$LOWER_CONF" == "release" && "$BUNDLE_ID" == "com.steipete.codexbar" ]]; then
+  if [[ ! -f "$PROVISIONING_PROFILE_SOURCE" ]]; then
+    echo "ERROR: Missing $PROVISIONING_PROFILE_SOURCE (required for iCloud entitlements in release builds)" >&2
+    exit 1
+  fi
+  EMBED_PROVISIONING_PROFILE=1
+  ICLOUD_ENTITLEMENT_KEYS=$(cat <<ICLOUD
+    <key>com.apple.application-identifier</key>
+    <string>${APP_TEAM_ID}.${BUNDLE_ID}</string>
+    <key>com.apple.developer.team-identifier</key>
+    <string>${APP_TEAM_ID}</string>
+    <key>com.apple.developer.icloud-services</key>
+    <array>
+        <string>CloudKit</string>
+    </array>
+    <key>com.apple.developer.icloud-container-identifiers</key>
+    <array>
+        <string>iCloud.${BUNDLE_ID}</string>
+    </array>
+    <key>com.apple.developer.icloud-container-environment</key>
+    <string>Production</string>
+ICLOUD
+)
+fi
 cat > "$APP_ENTITLEMENTS" <<PLIST
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -251,6 +281,7 @@ cat > "$APP_ENTITLEMENTS" <<PLIST
     <array>
         <string>${APP_GROUP_ID}</string>
     </array>
+${ICLOUD_ENTITLEMENT_KEYS}
     $(if [[ "$ALLOW_LLDB" == "1" ]]; then echo "    <key>com.apple.security.get-task-allow</key><true/>"; fi)
 </dict>
 </plist>
@@ -562,6 +593,12 @@ if [[ -d "${APP}/Contents/PlugIns/CodexBarWidget.appex" ]]; then
     "$APP/Contents/PlugIns/CodexBarWidget.appex"
 fi
 
+# Embed the Developer ID provisioning profile (authorizes the iCloud entitlements;
+# Gatekeeper re-validates it at every launch, so it must be sealed into the signature).
+if [[ "$EMBED_PROVISIONING_PROFILE" == "1" ]]; then
+  cp "$PROVISIONING_PROFILE_SOURCE" "$APP/Contents/embedded.provisionprofile"
+fi
+
 # Finally sign the app bundle itself
 codesign "${CODESIGN_ARGS[@]}" \
   --entitlements "$APP_ENTITLEMENTS" \

Scripts/package_app.sh

@@ -112,6 +112,7 @@ struct CodexBarApp: App {
             PreferencesView(
                 settings: self.settings,
                 store: self.store,
+                cloudSyncState: self.appDelegate.cloudSyncState,
                 updater: self.appDelegate.updaterController,
                 selection: self.preferencesSelection,
                 managedCodexAccountCoordinator: self.managedCodexAccountCoordinator,
@@ -377,6 +378,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     let updaterController: UpdaterProviding = makeUpdaterController()
+    let cloudSyncState = CloudSyncState()
     private let confettiOverlayController = ScreenConfettiOverlayController()
     private let confettiLogger = CodexBarLog.logger(LogCategories.confetti)
     private lazy var memoryPressureMonitor = MemoryPressureMonitor(trimAppCaches: { [weak self] in
@@ -390,6 +392,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     private var preferencesSelection: PreferencesSelection?
     private var managedCodexAccountCoordinator: ManagedCodexAccountCoordinator?
     private var codexAccountPromotionCoordinator: CodexAccountPromotionCoordinator?
+    private var cloudSyncCoordinator: CloudSyncCoordinator?
     private var hasInstalledLimitResetObservers = false
     #if DEBUG
     private var debugMemoryPressureObserver: NSObjectProtocol?
@@ -405,6 +408,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         self.preferencesSelection = dependencies.selection
         self.managedCodexAccountCoordinator = dependencies.managedCodexAccountCoordinator
         self.codexAccountPromotionCoordinator = dependencies.codexAccountPromotionCoordinator
+        self.cloudSyncCoordinator = CloudSyncCoordinator(settings: dependencies.settings, state: self.cloudSyncState)
     }
 
     func applicationWillFinishLaunching(_ notification: Notification) {
@@ -417,6 +421,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         self.installDebugMemoryPressureObserverIfNeeded()
         #endif
         self.ensureStatusController()
+        self.cloudSyncCoordinator?.start()
         Task { @MainActor [weak self] in
             await Task.yield()
             guard let settings = self?.settings else { return }
@@ -452,6 +457,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     }
 
     func applicationWillTerminate(_ notification: Notification) {
+        self.cloudSyncCoordinator?.stop()
         self.memoryPressureMonitor.stop()
         #if DEBUG
         self.removeDebugMemoryPressureObserver()
@@ -462,6 +468,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         self.terminateActiveProcessesForAppShutdown()
     }
 
+    func applicationDidBecomeActive(_ notification: Notification) {
+        self.cloudSyncCoordinator?.applicationDidBecomeActive()
+    }
+
     func runProviderLoginFlow(_ provider: UsageProvider) async {
         self.ensureStatusController()
         guard let statusController else { return }
@@ -557,6 +567,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
                 managedCodexAccountCoordinator,
                 codexAccountPromotionCoordinator)
             if let statusController = self.statusController as? StatusItemController {
+                statusController.cloudSyncState = self.cloudSyncState
                 MenuSwitchFlickerProbe.startIfRequested(controller: statusController)
             }
             return

Scripts/profiles/CodexBar-DeveloperID.provisionprofile

@@ -0,0 +1,74 @@
+import CodexBarCore
+import Foundation
+import SwiftUI
+
+struct FleetAccountMenuProjection {
+    let fallback: AccountSnapshotSyncPayload?
+    let additionalAccounts: [AccountSnapshotSyncPayload]
+}
+
+enum FleetAccountMenuPlanner {
+    static func projection(
+        provider: UsageProvider,
+        snapshots: some Sequence<AccountSnapshotSyncPayload>,
+        currentDeviceID: String,
+        localAccountKeys: Set<String>,
+        hasLocalUsage: Bool) -> FleetAccountMenuProjection
+    {
+        let remote = snapshots
+            .filter { $0.provider == provider && $0.deviceID != currentDeviceID }
+        let freshestByAccount = Dictionary(grouping: remote, by: \.accountKey)
+            .compactMap { _, candidates in candidates.max(by: self.isOlder) }
+            .sorted(by: self.isNewer)
+        let fallback = hasLocalUsage ? nil : freshestByAccount.first
+        let additionalAccounts = freshestByAccount.filter { candidate in
+            !localAccountKeys.contains(candidate.accountKey) && candidate.accountKey != fallback?.accountKey
+        }
+        return FleetAccountMenuProjection(fallback: fallback, additionalAccounts: additionalAccounts)
+    }
+
+    static func badge(deviceName: String, fetchedAt: Date, now: Date = .now) -> String {
+        "via \(deviceName) · \(self.staleness(fetchedAt: fetchedAt, now: now))"
+    }
+
+    static func staleness(fetchedAt: Date, now: Date = .now) -> String {
+        let seconds = max(0, Int(now.timeIntervalSince(fetchedAt)))
+        if seconds < 60 {
+            return L("just now")
+        }
+        if seconds < 3600 {
+            return String(format: L("%dm ago"), max(1, seconds / 60))
+        }
+        if seconds < 86400 {
+            return String(format: L("%dh ago"), max(1, seconds / 3600))
+        }
+        return String(format: L("%dd ago"), max(1, seconds / 86400))
+    }
+
+    private static func isOlder(_ lhs: AccountSnapshotSyncPayload, _ rhs: AccountSnapshotSyncPayload) -> Bool {
+        if lhs.fetchedAt != rhs.fetchedAt {
+            return lhs.fetchedAt < rhs.fetchedAt
+        }
+        return lhs.deviceID < rhs.deviceID
+    }
+
+    private static func isNewer(_ lhs: AccountSnapshotSyncPayload, _ rhs: AccountSnapshotSyncPayload) -> Bool {
+        if lhs.fetchedAt != rhs.fetchedAt {
+            return lhs.fetchedAt > rhs.fetchedAt
+        }
+        if lhs.accountKey != rhs.accountKey {
+            return lhs.accountKey < rhs.accountKey
+        }
+        return lhs.deviceID < rhs.deviceID
+    }
+}
+
+struct FleetAccountMenuCardView: View {
+    let model: UsageMenuCardView.Model
+    let width: CGFloat
+
+    var body: some View {
+        UsageMenuCardView(model: self.model, width: self.width)
+            .opacity(0.78)
+    }
+}