From ff66921e3c433fca13273bbd5fa21bb30f1ad567 Mon Sep 17 00:00:00 2001 From: Anne-Marie <102995847+am-stead@users.noreply.github.com> Date: Thu, 30 Apr 2026 22:55:50 +0100 Subject: [PATCH 1/3] [Improvement]: UBB - Move annual plan model multipliers to standalone article #22373 (#61017) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com> --- .../usage-based-billing-for-individuals.md | 2 +- .../reference/copilot-billing/index.md | 3 +- .../model-multipliers-for-annual-plans.md | 60 +++++++++++++++++++ .../copilot-billing/models-and-pricing.md | 12 +--- 4 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 content/copilot/reference/copilot-billing/model-multipliers-for-annual-plans.md diff --git a/content/copilot/concepts/billing/usage-based-billing-for-individuals.md b/content/copilot/concepts/billing/usage-based-billing-for-individuals.md index ce0649c52143..536a16df1b83 100644 --- a/content/copilot/concepts/billing/usage-based-billing-for-individuals.md +++ b/content/copilot/concepts/billing/usage-based-billing-for-individuals.md @@ -75,7 +75,7 @@ You will have the option to: * Cancel your plan and receive a prorated refund. * Wait to be downgraded to {% data variables.copilot.copilot_free_short %} at renewal time. -Note that, starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing#model-multipliers-for-annual-copilot-pro-and-copilot-pro-subscribers). +Note that, starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/model-multipliers-for-annual-plans). ## Next steps diff --git a/content/copilot/reference/copilot-billing/index.md b/content/copilot/reference/copilot-billing/index.md index b159a6a8f484..22b93c9c1afc 100644 --- a/content/copilot/reference/copilot-billing/index.md +++ b/content/copilot/reference/copilot-billing/index.md @@ -5,7 +5,8 @@ intro: Find billing information about {% data variables.product.prodname_copilot versions: feature: copilot children: - - /models-and-pricing + - /models-and-pricing + - /model-multipliers-for-annual-plans - /billing-cycle - /seat-assignment - /license-changes diff --git a/content/copilot/reference/copilot-billing/model-multipliers-for-annual-plans.md b/content/copilot/reference/copilot-billing/model-multipliers-for-annual-plans.md new file mode 100644 index 000000000000..1d7044356511 --- /dev/null +++ b/content/copilot/reference/copilot-billing/model-multipliers-for-annual-plans.md @@ -0,0 +1,60 @@ +--- +title: Model multipliers for annual plans staying on request-based billing +intro: 'After June 1, 2026, model multipliers will change for {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers staying on annual plans under request-based billing.' +shortTitle: Model multipliers for annual plans +versions: + feature: copilot +category: + - Learn about Copilot +allowTitleToDifferFromFilename: true +contentType: reference +--- + +> [!IMPORTANT] The model multiplier changes outlined in this article apply only to {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers who stay on their **existing annual plan** after June 1, 2026 and remain on the **premium request-based billing** model. +> +> If you choose to switch to monthly usage-based billing (with a prorated refund), these multiplier changes **do not apply** to you. + +## What is changing with {% data variables.product.prodname_copilot_short %} billing? + +{% data variables.product.github %} is changing how {% data variables.product.prodname_copilot_short %} usage is measured and billed. + +Today, each model interaction costs one premium request unit (PRU), and a multiplier is applied based on which model you use—more powerful models use more premium requests. Model multipliers are a concept specific to the current request-based billing system. + +**Starting June 1, 2026**, {% data variables.product.github %} is replacing request-based billing with usage-based billing, where the cost of an interaction depends on two things: the model and the number of tokens consumed. + +Under usage-based billing, each plan will come with an included allowance of {% data variables.product.prodname_ai_credits %}, with the option to set a budget for additional usage. + +Model multipliers **do not apply** to usage-based billing. + +## What are my options as a {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} user on an existing annual plan? + +If you're on an existing **annual plan** for {% data variables.copilot.copilot_pro_short %} or {% data variables.copilot.copilot_pro_plus_short %}, you will have the option to: +* **Stay** on your existing annual plan under premium request-based billing. When your annual plan ends, you'll be automatically downgraded to {% data variables.copilot.copilot_free_short %}. +* **Cancel** your plan, receive a prorated refund, and optionally, re-subscribe to the equivalent monthly paid plan. +* **Upgrade** to a monthly paid plan and receive prorated credits for the remaining value of the annual plan. For example, if you're on a {% data variables.copilot.copilot_pro_short %} annual plan, you can upgrade to a monthly {% data variables.copilot.copilot_pro_plus_short %} plan. + +## What happens if I keep my annual plan? + +Your existing annual plan will continue to track your {% data variables.product.prodname_copilot_short %} expenditure using premium requests, combined with the model multiplier, until the plan ends. + +In addition, if you keep your annual plan under request-based billing, you will experience changes to model multipliers starting **June 1, 2026**. The table below shows how the multipliers for each model will adjust. + +## Model multipliers for annual {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers + +The table below shows how the multipliers for each model will change on June 1, 2026. + +These new multipliers will **only apply** if you remain on an annual {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} under the premium request-based billing model _after_ June 1, 2026. + +Model multipliers and costs are subject to change. + +| Model | Current multiplier | New multiplier | +| --- | ---: | ---: | +| {% for entry in tables.copilot.annual-subscriber-model-multipliers %} | +| {{ entry.model }} | {{ entry.current_multiplier }} | {{ entry.new_multiplier }} | +| {% endfor %} | + +## Next steps + +* To understand more about how usage-based billing works, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals). +* To learn more about model prices under usage-based billing, see [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing). +* To compare how your expenditure will look under usage-based billing compared to request-based billing, see [AUTOTITLE](/copilot/how-tos/manage-and-track-spending/prepare-for-your-move-to-usage-based-billing). \ No newline at end of file diff --git a/content/copilot/reference/copilot-billing/models-and-pricing.md b/content/copilot/reference/copilot-billing/models-and-pricing.md index a61d41adcb4b..a184fca6a2bf 100644 --- a/content/copilot/reference/copilot-billing/models-and-pricing.md +++ b/content/copilot/reference/copilot-billing/models-and-pricing.md @@ -112,16 +112,6 @@ You can view your current {% data variables.product.prodname_actions %} usage fo -Starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. The table below shows how the multipliers for each model will adjust. +Starting June 1, 2026, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers who choose to remain on **existing annual billing plans** and stay on the **request-based billing** model will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/model-multipliers-for-annual-plans). - -Model multipliers and costs are subject to change. - -For information about your options as an annual subscriber, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals#if-youre-on-an-annual-plan). - -| Model | Current multiplier | New multiplier | -| --- | ---: | ---: | -| {% for entry in tables.copilot.annual-subscriber-model-multipliers %} | -| {{ entry.model }} | {{ entry.current_multiplier }} | {{ entry.new_multiplier }} | -| {% endfor %} | From 6ffe3b9209160344231ac0e05acd9ab1c3a89f1b Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Thu, 30 Apr 2026 15:43:18 -0700 Subject: [PATCH 2/3] Add GitHub authentication metadata documents page (#60980) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: hpsin <1666363+hpsin@users.noreply.github.com> Co-authored-by: Joe Clark <31087804+jc-clark@users.noreply.github.com> --- ...thub-authentication-discovery-endpoints.md | 38 +++++++++++++++++++ content/apps/index.md | 1 + 2 files changed, 39 insertions(+) create mode 100644 content/apps/github-authentication-discovery-endpoints.md diff --git a/content/apps/github-authentication-discovery-endpoints.md b/content/apps/github-authentication-discovery-endpoints.md new file mode 100644 index 000000000000..718f50774736 --- /dev/null +++ b/content/apps/github-authentication-discovery-endpoints.md @@ -0,0 +1,38 @@ +--- +title: GitHub authentication discovery endpoints +shortTitle: OAuth 2.0 and OIDC Discovery documents +intro: '{% data variables.product.github %} publishes OAuth 2.0 and OpenID Connect metadata documents.' +versions: + fpt: '*' + ghes: '*' + ghec: '*' +category: + - Understand GitHub Apps +--- + +> [!NOTE] +> The {% data variables.product.github %} authentication metadata documents described in this article are in {% data variables.release-phases.public_preview %} and subject to change. +> While the endpoints may be present on {% data variables.enterprise.data_residency %} and some versions of {% data variables.product.prodname_ghe_server %}, they contain incorrect information. + +{% data variables.product.github %} publishes two metadata documents used in the OAuth 2.0 and OpenID Connect protocols: + +* **OAuth 2.0 Authorization Server Metadata** ([RFC 8414](https://datatracker.ietf.org/doc/html/rfc8414)): `https://github.com/.well-known/oauth-authorization-server/login/oauth` +* **OpenID Connect Discovery** ([OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html)): `https://github.com/login/oauth/.well-known/openid-configuration` + +These documents are used to validate tokens issued by {% data variables.product.github %} as well as programmatically determine how to sign in a user. + +## Intended use + +These documents are only published for MCP clients using [RFC 9728](https://datatracker.ietf.org/doc/html/rfc9728) to discover the OAuth 2.0 endpoints needed to get a token for the {% data variables.product.github %} MCP server. + +{% data variables.product.github %} does not currently implement OpenID Connect in its OAuth flows and does not issue ID tokens for users or apps. + +## Issuer + +The issuer for {% data variables.product.prodname_dotcom_the_website %} is `https://github.com/login/oauth`. + +This is the base URL used to find the other documents listed and an important parameter when configuring authentication libraries. + +## Difference from GitHub Actions tokens + +These metadata documents do not apply to the tokens issued for {% data variables.product.prodname_actions %} workflows. {% data variables.product.prodname_actions %} uses a separate dedicated issuer and token profile. For more information about Actions tokens, see [AUTOTITLE](/actions/concepts/security/openid-connect). diff --git a/content/apps/index.md b/content/apps/index.md index 63bd4c96a480..95e7a018addb 100644 --- a/content/apps/index.md +++ b/content/apps/index.md @@ -41,6 +41,7 @@ children: - /maintaining-github-apps - /github-marketplace - /oauth-apps + - /github-authentication-discovery-endpoints redirect_from: - /developers - /developers/apps/getting-started-with-apps From 337eca715734bab8e134b9d0acf6a4a1aa75f21b Mon Sep 17 00:00:00 2001 From: docs-bot <77750099+docs-bot@users.noreply.github.com> Date: Thu, 30 Apr 2026 15:43:50 -0700 Subject: [PATCH 3/3] Delete orphaned files (2026-04-27-16-54) (#60969) --- .../copilot/copilot-edits/about-copilot-edits.md | 9 --------- data/reusables/copilot/signup-procedure-org.md | 3 --- 2 files changed, 12 deletions(-) delete mode 100644 data/reusables/copilot/copilot-edits/about-copilot-edits.md delete mode 100644 data/reusables/copilot/signup-procedure-org.md diff --git a/data/reusables/copilot/copilot-edits/about-copilot-edits.md b/data/reusables/copilot/copilot-edits/about-copilot-edits.md deleted file mode 100644 index 22dfbce475ac..000000000000 --- a/data/reusables/copilot/copilot-edits/about-copilot-edits.md +++ /dev/null @@ -1,9 +0,0 @@ -Use {% data variables.copilot.copilot_edits_short %} to make changes across multiple files directly from a single {% data variables.copilot.copilot_chat_short %} prompt. {% data variables.copilot.copilot_edits_short %} has the following modes: - -#### Edit mode - -{% data reusables.copilot.copilot-edits.edit-mode-description %} - -#### Agent mode - -{% data reusables.copilot.copilot-edits.agent-mode-description %} diff --git a/data/reusables/copilot/signup-procedure-org.md b/data/reusables/copilot/signup-procedure-org.md deleted file mode 100644 index a7b4452ecf5c..000000000000 --- a/data/reusables/copilot/signup-procedure-org.md +++ /dev/null @@ -1,3 +0,0 @@ -1. To purchase {% data variables.product.prodname_copilot %} for your organization, [contact {% data variables.product.github %}'s Sales team](https://github.com/enterprise/contact?ref_product=copilot&ref_type=engagement&ref_style=text). -1. A member of the Sales team will work with you to set up {% data variables.product.prodname_copilot_short %} for your organization. -1. For more information about assigning seats, see [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/granting-access-to-copilot-for-members-of-your-organization).