Skip to content

Sync upstream changes through cc8da27ce - #91

Merged
ColumbusLabs merged 7 commits into
mainfrom
codex/upstream-sync-90-20260721
Jul 21, 2026
Merged

Sync upstream changes through cc8da27ce#91
ColumbusLabs merged 7 commits into
mainfrom
codex/upstream-sync-90-20260721

Conversation

@ColumbusLabs

Copy link
Copy Markdown
Owner

Summary

  • Merge Pete upstream range f8636cb..cc8da27 (3 non-merge commits) while preserving upstream history.
  • Carry the new descriptor-based pace behavior through QuotaKit Mac-to-mobile/widget sync, including calendar-month inference and the existing 3% display threshold.
  • Isolate a pre-existing SpendDashboardController test from persisted standard preferences exposed by the full suite.
  • Advance UPSTREAM_MONITOR_BASE and sync date without changing shipped upstream version, Mac/mobile build numbers, CloudKit configuration, QuotaKit identity, appcast, or release URLs.

Reviewed risk areas

  • Provider/quota: percent clamping, pace capability descriptors, Copilot/Grok/Doubao behavior.
  • Process/CLI/runtime: environment-test stabilization and runtime call sites.
  • Mobile/widget/sync: SyncUsagePace serialization parity and unsupported-window rejection.
  • Identity/release: QuotaKit and Columbus Labs branding, release metadata, appcast ownership, CloudKit, and build numbers preserved.

Validation

  • ./Scripts/check_upstreams.sh: 0 commits after cc8da27
  • git diff --check: passed
  • swift build: passed
  • swift test --filter UsagePercentTests and ProviderPaceTests: 4 passed
  • focused provider/runtime suites: 168 passed
  • swift test --filter SyncCoordinatorDescriptorPaceTests or SpendDashboardControllerTests: 28 passed
  • make test: 64/64 groups, 762 selections, 0 failures or retries
  • PARSER_LINT_BASE=origin/main ./Scripts/lint.sh lint: passed, including localization, branding, and provider palette audits

Closes #90

@cursor

cursor Bot commented Jul 21, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@ColumbusLabs
ColumbusLabs merged commit fa17e5c into main Jul 21, 2026
9 checks passed
@ColumbusLabs
ColumbusLabs deleted the codex/upstream-sync-90-20260721 branch July 21, 2026 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upstream Changes Available for Review

2 participants