Skip to content

Upstream sync conflict at e63c5fe4#11

Description

@github-actions

馃攧 Upstream Changes Detected

steipete/CodexBar: 5028 new commits
quotio: 55 new commits (last 7 days)
Source refs: upstream/main, quotio/master

steipete/CodexBar Recent Commits

7fdc17636 docs: correct provider usage visibility controls (#3535)
4865f98ed fix: prevent RTL hero overlap (#3514)
f5c94a118 fix: correct Codex credential recovery guidance (#3534)
3b6864fa9 fix: refresh cached status menu appearance (#3526)
5c0d7b4f8 perf: avoid decoding event history for Codex activity (#3528)
33161afe7 chore: start 0.58.1 development
88fa2f45f docs: update appcast for 0.58.0
518743e2d chore: prepare 0.58.0 release
d8fa1d545 feat: show reset times in compact account rows (#3477)
207eef7f1 feat: configure provider usage row visibility (#3196)

quotio Recent Commits

a00101078 fix(amp): parse amount-based subscription usage
cdee9a8e7 docs: scope Quotio verification to the requested change
195acea23 fix(accounts): merge quota aliases while preserving source identity
05661048f fix(quota): reconcile codex account aliases across quota views
4db535596 fix(warmup): reconfigure scheduler after model selection changes
f553f9d1b fix(proxy): retain replaced version during rollback
0d37cdb48 fix(warmup): preserve failed run status
883878af2 fix(quota): harden refresh reconciliation
9a23c4d21 fix(codex): exclude disabled native accounts
1176cc3aa fix(tunnel): reset retry budget after recovery

馃搵 Review Actions

Review upstream changes:

./Scripts/review_upstream.sh upstream

Review quotio changes:

./Scripts/analyze_quotio.sh

View detailed diffs:

git diff main..upstream/main
git log -p quotio/master --since='7 days ago'

馃敆 Links


Auto-generated by upstream-monitor workflow
Last checked: 2026-09-10T13:10:33.718Z

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions