Add Alibaba Coding Plan provider with web/API support#453
Add Alibaba Coding Plan provider with web/API support#453jnd0 wants to merge 7 commits intosteipete:mainfrom
Conversation
Implement Alibaba provider settings, region-aware console RPC parsing, tests, and docs; also fix cookie header normalization to avoid truncating values containing '-b', which caused false login-required failures for valid manual cookies.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: eb2cd354ea
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| let hasToken = !context.settings.alibabaCodingPlanAPIToken.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty | ||
| let hasManualCookie = | ||
| context.settings.alibabaCodingPlanCookieSource == .manual && | ||
| !context.settings.alibabaCodingPlanCookieHeader.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty | ||
| return hasToken || hasManualCookie |
There was a problem hiding this comment.
This availability check only returns true for API tokens, env cookies, or manual-cookie mode, so users who enable Alibaba with the default .auto cookie source and rely on browser cookie import are filtered out by enabledProviders() and never fetched. In that common setup the new web flow cannot run unless users also set an API key or manual cookie, which breaks the provider’s advertised auto web mode.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Addressed in 55d90b2: removed the strict app-side availability gate so Alibaba no longer gets filtered out for default .auto cookie mode. Auto-import setups now remain available and can fetch via web strategy as intended.
| { | ||
| let source = instanceInfo ?? payload | ||
| let status = self.anyString(for: ["status", "instanceStatus"], in: source)?.uppercased() | ||
| guard status == "VALID" || status == "ACTIVE" || instanceInfo != nil else { return nil } |
There was a problem hiding this comment.
The fallback guard accepts any non-nil instanceInfo (|| instanceInfo != nil), so payloads with inactive plans (for example status: EXPIRED) still produce a synthetic fiveHourUsedQuota=0/fiveHourTotalQuota=100 snapshot when quota fields are missing. That reports an active-looking quota window for inactive plans instead of failing parsing, which can show incorrect usage state.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Addressed in 55d90b2: fallback now only synthesizes a quota window for active/valid (or unspecified) status, and no longer does so for explicitly inactive statuses like EXPIRED.
|
Follow-up pushed in 352ea6b with final UX polish based on live validation:\n\n- keep countdown reset text (e.g. ) for Alibaba windows\n- show request usage detail under each bar ()\n- normalize 5-hour reset timestamps when backend returns near-now/stale values so we avoid incorrect \n- improve auto cookie import reliability for Alibaba by prioritizing Safari and filtering for authenticated cookie sets\n\nRe-tested with a live Alibaba Coding Plan account; menu now shows stable countdowns + request usage values across 5-hour/weekly/monthly windows. |
|
Follow-up pushed in 352ea6b with final UX polish based on live validation:
Re-tested with a live Alibaba Coding Plan account; menu now shows stable countdowns plus request usage values across 5-hour, weekly, and monthly windows. |
|
Fixed the remaining Alibaba web/session fetch issues and pushed Why this changed:
Summary:
Validation:
|
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 4ec2f52db7
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if httpResponse.statusCode == 401 || httpResponse.statusCode == 403 { | ||
| throw AlibabaCodingPlanUsageError.loginRequired | ||
| } |
There was a problem hiding this comment.
In the API-key fetch path, HTTP 401/403 is currently mapped to .loginRequired, but that error message tells users to sign in via browser cookies rather than fix their API key; this misclassifies the failure mode and sends users to the wrong remediation when keys are expired/invalid. Because this branch is only used for bearer/API-key requests, it should return .invalidCredentials so production failures are diagnosed correctly.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Addressed in 63cd143: API-key fetches now map HTTP 401/403 to AlibabaCodingPlanUsageError.invalidCredentials (not loginRequired), so the remediation matches API auth failures.
| if let override = AlibabaCodingPlanSettingsReader.hostOverride(environment: environment), | ||
| let hostURL = URL(string: override), | ||
| hostURL.scheme != nil |
There was a problem hiding this comment.
resolveConsoleSECToken only honors ALIBABA_CODING_PLAN_HOST when the override already includes a URL scheme, but AlibabaCodingPlanSettingsReader.hostOverride accepts bare hosts and the documented usage uses that form. With ALIBABA_CODING_PLAN_HOST=custom.aliyun.com, this branch falls back to region.dashboardURL, so web-mode token refresh ignores the override and can fail against non-default environments.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Addressed in 63cd143: resolveConsoleSECToken now accepts bare ALIBABA_CODING_PLAN_HOST values by normalizing them to an HTTPS dashboard URL via resolveConsoleDashboardURL/dashboardURL(from:region:), so token refresh honors host overrides without requiring a scheme.
| URLQueryItem(name: "action", value: "zeldaEasy.broadscope-bailian.codingPlan.queryCodingPlanInstanceInfoV2"), | ||
| URLQueryItem(name: "product", value: "broadscope-bailian"), | ||
| URLQueryItem(name: "api", value: "queryCodingPlanInstanceInfoV2"), | ||
| URLQueryItem(name: "currentRegionId", value: AlibabaCodingPlanAPIRegion.international.currentRegionID), |
There was a problem hiding this comment.
When ALIBABA_CODING_PLAN_HOST is set, resolveQuotaURL builds the request via url(from:), but that helper hard-codes currentRegionId to the international region. If users select China mainland and also use a host override, requests still carry ap-southeast-1, which can query the wrong regional quota context and return incorrect/empty usage.
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Addressed in 63cd143: host-override quota URL resolution is now region-aware (url(from:region:)) and uses the selected region for currentRegionId (including cn-beijing). Added regression coverage in AlibabaCodingPlanProviderTests.
|
@jnd0 Possible to address these comments? |
Done :) |
|
I tested this PR locally on macOS arm64 and found a couple of concrete issues with the Alibaba/Bailian Coding Plan provider in a China mainland setup. What I verified
Repro / observed behavior1)
|
|
Thanks @goodtiger for the CN repro details. I pushed a follow-up in What changed:
Validation run:
Known limitation (still explicit):
|
3 participants
Summary
Alibabaprovider (displayed as Alibaba / CLIalibaba-coding-plan) with full registry wiring, settings UI, icon, docs, and test coverage.sec_token+ form-encodedparams) with API-key fallback, intl/cn region handling, and resilient payload parsing for nestedDataV2structures.CookieHeaderNormalizerwhere-bregex matching could trigger inside cookie values (e.g....-Br...), truncating manual Cookie headers and causing falseConsoleNeedLoginfailures.What changed
Sources/CodexBarCore/Providers/Alibaba/*Sources/CodexBar/Providers/Alibaba/*UsageProvider.alibaba,IconStyle.alibababailian-*-cs*host)params,region,sec_tokencornerstoneParamfields to mirror console calls./tool/user/info.jsonfallback.data.DataV2.data.data) and quota fields.EXPIRED)..autocookie setups.docs/alibaba-coding-plan.md,docs/providers.md).CookieHeaderNormalizernow anchors--cookie/-bpattern matching to command boundaries so cookie-value substrings no longer get misparsed.Testing
swift test --filter AlibabaCodingPlan./Scripts/compile_and_run.shManual validation against a live Alibaba Coding Plan account:
Visual representation: