Skip to content

Sync upstream 6d8ad7d: page clock, range scheduling, batch disconnect, public errors - #24

Merged
xiaohai1314-sys merged 4 commits into
mainfrom
sync/upstream-6d8ad7d
Nov 19, 2026
Merged

xiaohai1314-sys merged 4 commits into
mainfrom
sync/upstream-6d8ad7d

Conversation

@xiaohai1314-sys

Copy link
Copy Markdown
Owner

Sync upstream Mag1cFall/AIStudio2API 6d8ad7d (based on fork main 2f7de40).

Upstream content (only 6d8ad7d carries real changes; bfe89bb is an empty merge that only credits Mag1cFall#180/Mag1cFall#182, and AUTH_RECOVERY is NOT in the tree): page clock (page_clock), range-based scheduling rewrite of dispatch.go, batch disconnect detection, public errors unified to English, settings-save/lifecycle refactor.

Fork hardening preserved:

Verification (all before push):

  • Frontend: npm ci && npx vp build passed
  • go vet ./... passed; GOOS=windows go vet -tags desktop,production passed; go build ./cmd/aistudio2api passed
  • Full go test ./cmd/... ./internal/...: 17 packages ok, only the 2 known environment failures in internal/aistudio (TestUserCacheRootWithoutEnvironment, TestHTTP3SlowResponse)
  • Targeted: TestFirstRejectionCoolsModelOnly (F2) PASS, TestAcquireWarmLeaseAllCoolingReturnsAllCoolingError (PR fix: 额度耗尽的账户不参与任何调度 #20) PASS, TestContentPolicyErrorMapping PASS

Note: pushed as snapshot commits, so upstream commits are not ancestors of main; the phantom behind-count grows and needs a separate record commit on a local machine (same as PR #22).

@xiaohai1314-sys
xiaohai1314-sys merged commit cdf9904 into main Nov 19, 2026
4 checks passed
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.

1 participant