Skip to content

chore(provider): drop misleading "team" suffix from Alibaba Token Plan display names - #5239

Merged
Astro-Han merged 1 commit into
apache:mainfrom
tanruixiang:fix/alibaba-token-plan-display-name
Oct 11, 2026
Merged

Astro-Han merged 1 commit into
apache:mainfrom
tanruixiang:fix/alibaba-token-plan-display-name

Conversation

@tanruixiang

@tanruixiang tanruixiang commented Sep 12, 2026 •

Copy link
Copy Markdown
Member

Summary

The zh-CN and zh-TW display names for alibaba-token-plan-cn and alibaba-token-plan include a "(团队版)" / "(團隊版)" suffix that suggests only the Team plan is supported. Aliyun's official docs confirm the Personal and Team plans share identical Base URLs and sk-sp- API key format, so a Personal plan subscription works without any difference. The suffix misleads users into thinking they need the Team plan and creates a false distinction between the two plans at the provider-selection level.

This renames the entries to the regional naming already used by Alibaba Coding Plan:

  • alibaba-token-plan-cn → Alibaba Token Plan 中国站
  • alibaba-token-plan → Alibaba Token Plan 国际站

No logic changes; display copy only.

Verification

  • Grepped the repo for remaining "团队版" / "團隊版" references — none found outside node_modules
  • Confirmed no test assertions reference the old display-name strings
  • Confirmed the revised names follow the same pattern as alibaba-coding-plan-cn / alibaba-coding-plan (Coding Plan 中国站 / Coding Plan 国际站)

AI use

  • Generative tooling made a substantive contribution

Tool(s) and scope: Maka (deepseek-v4-pro) — analyzed the provider-display-copy module and proposed the rename after comparing official Aliyun docs for Personal and Team Token Plan editions.

Checklist

  • Tests cover the change and fail without it
  • Lint, format, typecheck and the affected suites pass locally

Does this PR entail a change in behavior?

  • Yes — described under Summary above
  • No

@github-actions github-actions Bot added the effort/XS Under 10 readable lines label Sep 12, 2026
@tanruixiang tanruixiang changed the title fix: drop misleading "team" suffix from Alibaba Token Plan display names chore(provider): drop misleading "team" suffix from Alibaba Token Plan display names Sep 12, 2026

@me2seeks me2seeks left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review notice: This comment was posted by an automated review agent operated by me2seeks make. It is not an independent human review and does not replace one.

Summary

Drops the misleading "(团队版)" suffix from the Alibaba Token Plan zh-CN/zh-TW display names in favor of "中国站"/"国际站" and updates the matching Storybook fixture. Copy-only change in provider-display-copy.ts + one story fixture; the English names intentionally keep their distinct "(China)" wording. The renaming rationale (the plans are not team-scoped) matches the copy.

Findings

  1. [P2] This branch predates the main-line history rewrite: its tip's parent chain is not an ancestor of current main, so GitHub will require a rebase before merge and mergeable was UNKNOWN at snapshot time. The diff content is fine, but confirm mergeability after rebase — provider-display-copy.ts is a hot file and the sibling entries around it have moved.

Verdict

needs-discussion — copy change is correct; the branch must be rebased onto current main before it can merge.

@github-actions github-actions Bot added the stale No qualifying activity within the lifecycle policy window label Oct 7, 2026
@github-actions

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown

This pull request has had no new commits for 30 days and has been marked stale. It will be closed in 7 days unless a new commit is pushed.

Comments do not reset this timer: only a new commit does. If the pull request is intentionally long-lived, a maintainer can apply the pinned label.

@Astro-Han Astro-Han left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review notice: This comment was posted by an automated review agent. It is not an independent human review and does not replace one.

No P0–P2 code issue was found at 181910ecf1b43c5f3608cbbd1d747328ca4fa37a. The change replaces four zh-CN/zh-TW Alibaba Token Plan names with regional labels and updates one Storybook fixture. Provider IDs, endpoints, authentication, English copy, descriptions and badges are unchanged; existing user-saved connection names are not migrated.

The prior rebase/mergeability finding is not supported by the current state: GitHub reports MERGEABLE, and automatic merging with main bacb1caed is clean. The actual merged display module retains all four new names. A rewritten history or an earlier UNKNOWN result alone does not establish a defect. The exact-head test run 34703965250 succeeded; the two skipped edited-event runs do not negate that completed test run.

Five existing settings-copy tests passed. An independent execution of the actual parent/head/merged modules checked 183 provider/locale and fallback combinations: only the four intended names changed, and the fixture keeps its provider ID and slug. Biome passed both changed files. No Desktop build, native UI interaction or live provider call was run. Alibaba's Personal quick start and Team quick start list the same Beijing text endpoints and sk-sp- key format; this does not establish identical model entitlements or international availability. No protocol epoch change is involved.

[P3] Clarify the attribution category. The PR explicitly checks substantive generative contribution and names Maka/deepseek-v4-pro, but its sole authored commit has no Generated-by: trailer. If that substantive declaration is intended, preserve the tool attribution in the commit. If this was only a wording edit, clarify the declaration instead: CONTRIBUTING explicitly exempts wording edits from substantive attribution. This is not a runtime defect.

@Astro-Han Astro-Han left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved at @Astro-Han's explicit request: the automated review of this exact head found no blocking (P0–P2) issues, and CI is green.

@Astro-Han Astro-Han left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved at @Astro-Han's explicit request: the automated review of this exact head found no blocking (P0–P2) issues, and CI is green.

@Astro-Han

Copy link
Copy Markdown
Contributor

This PR is approved, but it can't merge yet: its only test run is from 2026-09-12, built against main as it was then. Re-running that run reproduces a Storybook failure in the Usage settings stories (168.03125 <= 168) that this PR doesn't touch and that has since been fixed on main. Could you rebase onto (or merge) current main and push, so test runs against current main? No code changes are needed.

Automated notice: This comment was posted by an automated agent operated by Astro-Han, at the maintainer's direction.

@tanruixiang
tanruixiang force-pushed the fix/alibaba-token-plan-display-name branch from 181910e to 7d6427b Compare October 11, 2026 12:50
@tanruixiang

Copy link
Copy Markdown
Member Author

This PR is approved, but it can't merge yet: its only test run is from 2026-09-12, built against main as it was then. Re-running that run reproduces a Storybook failure in the Usage settings stories (168.03125 <= 168) that this PR doesn't touch and that has since been fixed on main. Could you rebase onto (or merge) current main and push, so test runs against current main? No code changes are needed.

Automated notice: This comment was posted by an automated agent operated by Astro-Han, at the maintainer's direction.

Thanks for your help, I have rebaed the main.

@Astro-Han Astro-Han left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated review notice: This comment was posted by an automated review agent. It is not an independent human review and does not replace one.

Incremental review to 7d6427be. This head rebases the previously reviewed change (181910ec) onto current main. The author's diff is byte-for-byte unchanged: the same two files, +5/-5. test now passes on this head. No new findings, and the earlier P3 about the AI-use disclosure stands as before.

@Astro-Han Astro-Han left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved at @Astro-Han's explicit request: the automated review of this exact head found no blocking (P0–P2) issues, and CI is green.

@Astro-Han
Astro-Han merged commit 9a32d42 into apache:main Oct 11, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

effort/XS Under 10 readable lines stale No qualifying activity within the lifecycle policy window

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants