Upstream sync needs attention #2

Activity

1. github-actions commented on Oct 5, 2026

   

   github-actionsbot

   on Oct 5, 2026 – with GitHub Actions

   Author

   More actions

   The upstream sync could not merge v8.0.15 into main. Nothing was pushed and no image was published.

   The merge conflicts in:

   • sdk/cliproxy/service_lifecycle.go

   Run: https://github.com/ntindle/CLIProxyAPI/actions/runs/37357026086

   To fix it locally:

   git fetch https://github.com/router-for-me/CLIProxyAPI.git 'refs/tags/v*:refs/tags/v*'
   git merge v8.0.15
   git checkout HEAD -- .github/workflows
   bash .github/scripts/fork-check.sh
   git push origin main
2. ntindle

   added a commit that references this issue on Oct 9, 2026

   Merge upstream v8.0.22 into main

   ...

   cf5fa09
3. ntindle commented on Oct 9, 2026

   

   ntindle

   on Oct 9, 2026

   Owner

   More actions

   Resolved by hand in cf5fa09: merged upstream v8.0.22 into main. The conflicts were sdk/cliproxy/service_lifecycle.go (the fork's quota refresher and live model sync next to upstream's new Antigravity refresh), plus sdk/cliproxy/auth/conductor_lifecycle.go and sdk/api/handlers/openai/openai_responses_handlers.go (the Meta usage changes from #4 against upstream's refactors). fork-check.sh and go test ./... pass.
4. ntindle

   closed this as completedon Oct 9, 2026