From 876e719211063724a7308f125de25ea94c726f10 Mon Sep 17 00:00:00 2001 From: hubwriter Date: Thu, 11 Sep 2025 14:22:11 +0100 Subject: [PATCH 1/3] Remove CCR from Xcode tab of custom instructions article (#57499) --- .../add-organization-instructions.md | 2 +- .../add-repository-instructions.md | 39 +++++++++++++------ ...itory-custom-instructions-prerequisites.md | 3 ++ .../repository-custom-instructions-support.md | 7 ++++ 4 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 data/reusables/copilot/repository-custom-instructions-prerequisites.md create mode 100644 data/reusables/copilot/repository-custom-instructions-support.md diff --git a/content/copilot/how-tos/configure-custom-instructions/add-organization-instructions.md b/content/copilot/how-tos/configure-custom-instructions/add-organization-instructions.md index 794cd84fe0..d4f773c031 100644 --- a/content/copilot/how-tos/configure-custom-instructions/add-organization-instructions.md +++ b/content/copilot/how-tos/configure-custom-instructions/add-organization-instructions.md @@ -18,7 +18,7 @@ contentType: how-tos > [!NOTE] > This feature is currently in {% data variables.release-phases.public_preview %} and is subject to change. > -> Organization custom instructions are currently only supported for {% data variables.copilot.copilot_chat_short %} on {% data variables.product.prodname_dotcom_the_website %} and {% data variables.copilot.copilot_code-review_short %}. +> **Support:** Organization custom instructions are currently only supported for {% data variables.copilot.copilot_chat_short %} on {% data variables.product.prodname_dotcom_the_website %} and {% data variables.copilot.copilot_code-review_short %} on {% data variables.product.prodname_dotcom_the_website %}. For an overview of the methods you can use to customize {% data variables.copilot.copilot_chat %} responses, see [AUTOTITLE](/copilot/concepts/about-customizing-github-copilot-chat-responses?tool=webui). diff --git a/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md b/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md index d840a90584..f7348dd946 100644 --- a/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md +++ b/content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md @@ -19,30 +19,54 @@ redirect_from: This version of this article is for using repository custom instructions on the {% data variables.product.github %} website. Click the tabs above for information on using custom instructions in other environments. +{% data reusables.copilot.repository-custom-instructions-support %} +* **{% data variables.copilot.copilot_code-review_short %}** + +{% data reusables.copilot.repository-custom-instructions-prerequisites %} + {% endwebui %} {% vscode %} This version of this article is for using repository custom instructions and prompt files in {% data variables.product.prodname_vscode_shortname %}. Click the tabs above for instructions on using custom instructions in other environments. +{% data reusables.copilot.repository-custom-instructions-support %} +* **{% data variables.copilot.copilot_code-review_short %}** + +{% data reusables.copilot.repository-custom-instructions-prerequisites %} + {% endvscode %} {% visualstudio %} This version of this article is for using repository custom instructions in {% data variables.product.prodname_vs %}. Click the tabs above for instructions on using custom instructions in other environments. +{% data reusables.copilot.repository-custom-instructions-support %} +* **{% data variables.copilot.copilot_code-review_short %}** + +{% data reusables.copilot.repository-custom-instructions-prerequisites %} + {% endvisualstudio %} {% jetbrains %} This version of this article is for using repository custom instructions in JetBrains IDEs. Click the tabs above for instructions on using custom instructions in other environments. +{% data reusables.copilot.repository-custom-instructions-support %} +* **{% data variables.copilot.copilot_code-review_short %}** + +{% data reusables.copilot.repository-custom-instructions-prerequisites %} + {% endjetbrains %} {% xcode %} This version of this article is for using repository custom instructions in Xcode. Click the tabs above for instructions on using custom instructions in other environments. +{% data reusables.copilot.repository-custom-instructions-support %} + +{% data reusables.copilot.repository-custom-instructions-prerequisites %} + {% endxcode %} {% eclipse %} @@ -51,21 +75,12 @@ This version of this article is for using repository custom instructions in Xcod This version of this article is for using repository custom instructions in Eclipse. Click the tabs above for instructions on using custom instructions in other environments. -{% endeclipse %} - -## About repository custom instructions for {% data variables.product.prodname_copilot_short %} - -Repository custom instructions let you provide {% data variables.product.prodname_copilot_short %} with repository-specific guidance and preferences. - -Repository custom instructions are currently supported for: -* **{% data variables.copilot.copilot_chat_short %}** in {% data variables.product.prodname_vscode_shortname %} -* **{% data variables.copilot.copilot_chat_short %}** in {% data variables.product.prodname_vs %}, JetBrains IDEs, Xcode, Eclipse, and on the {% data variables.product.github %} website (`copilot-instructions.md` file only) -* **{% data variables.copilot.copilot_coding_agent %}** +{% data reusables.copilot.repository-custom-instructions-support %} * **{% data variables.copilot.copilot_code-review_short %}** -## Prerequisites for repository custom instructions +{% data reusables.copilot.repository-custom-instructions-prerequisites %} -* You must have a custom instructions file (see the instructions below). +{% endeclipse %} {% webui %} diff --git a/data/reusables/copilot/repository-custom-instructions-prerequisites.md b/data/reusables/copilot/repository-custom-instructions-prerequisites.md new file mode 100644 index 0000000000..afe3b5315e --- /dev/null +++ b/data/reusables/copilot/repository-custom-instructions-prerequisites.md @@ -0,0 +1,3 @@ +## Prerequisites for repository custom instructions + +* You must have a custom instructions file (see the instructions below). diff --git a/data/reusables/copilot/repository-custom-instructions-support.md b/data/reusables/copilot/repository-custom-instructions-support.md new file mode 100644 index 0000000000..2a2bdbf239 --- /dev/null +++ b/data/reusables/copilot/repository-custom-instructions-support.md @@ -0,0 +1,7 @@ +## About repository custom instructions for {% data variables.product.prodname_copilot_short %} + +Repository custom instructions let you provide {% data variables.product.prodname_copilot_short %} with repository-specific guidance and preferences. + +Repository custom instructions are currently supported for: +* **{% data variables.copilot.copilot_coding_agent %}** +* **{% data variables.copilot.copilot_chat_short %}** From c0c45392e00104ad7d7e8cfd0cb9ac46b3e4a7bb Mon Sep 17 00:00:00 2001 From: Jenni C <97056108+dihydroJenoxide@users.noreply.github.com> Date: Thu, 11 Sep 2025 07:28:21 -0700 Subject: [PATCH 2/3] Copilot auto model selection (#57410) Co-authored-by: Nhu Do --- .../copilot/concepts/auto-model-selection.md | 35 +++++++++++++++++++ .../concepts/billing/copilot-requests.md | 5 ++- content/copilot/concepts/index.md | 1 + .../use-ai-models/change-the-chat-model.md | 10 +++--- .../configure-access-to-ai-models.md | 5 ++- .../reference/ai-models/model-comparison.md | 4 ++- .../reference/ai-models/supported-models.md | 2 ++ .../copilot/auto-model-multiplier-discount.md | 1 + .../reusables/copilot/auto-model-selection.md | 1 + data/reusables/copilot/change-the-ai-model.md | 2 +- data/variables/copilot.yml | 3 ++ 11 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 content/copilot/concepts/auto-model-selection.md create mode 100644 data/reusables/copilot/auto-model-multiplier-discount.md create mode 100644 data/reusables/copilot/auto-model-selection.md diff --git a/content/copilot/concepts/auto-model-selection.md b/content/copilot/concepts/auto-model-selection.md new file mode 100644 index 0000000000..c2c41415e6 --- /dev/null +++ b/content/copilot/concepts/auto-model-selection.md @@ -0,0 +1,35 @@ +--- +title: 'About {% data variables.product.prodname_copilot_short %} auto model selection' +allowTitleToDifferFromFilename: true +shortTitle: 'Auto model selection' +intro: 'Optimize {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode_shortname %} without needing to select a model' +product: '{% data variables.copilot.copilot_auto_model_selection_short_cap_a %} is available in {% data variables.product.prodname_vscode_shortname %} with the {% data variables.copilot.copilot_free %}, {% data variables.copilot.copilot_pro %} and {% data variables.copilot.copilot_pro_plus %} plans.' +topics: + - Copilot +versions: + feature: copilot +contentType: concepts +--- + +> [!NOTE] {% data variables.copilot.copilot_auto_model_selection %} rolls out to {% data variables.product.prodname_vscode_shortname %} starting in September 2025. + +## Overview + +Experience less rate limiting and reduce the mental load of choosing a model by letting {% data variables.copilot.copilot_auto_model_selection %} automatically choose the best available model. + +{% data variables.copilot.copilot_auto_model_selection %} is available in {% data variables.product.prodname_vscode_shortname %}. Models are selected based on availability and to reduce rate limiting. Included models may change over time. + +Automatically selected models **won't** include these models: +* Models with premium request multipliers greater than one. See [AUTOTITLE](/copilot/reference/ai-models/supported-models#model-multipliers). +* Models excluded by individual or administrator policies. See [AUTOTITLE](/copilot/how-tos/use-ai-models/configure-access-to-ai-models). +* Models not available in your plan. See [AUTOTITLE](/copilot/reference/ai-models/supported-models#supported-ai-models-per-copilot-plan). + +To see which model was used for each response, hover over the response in {% data variables.copilot.copilot_chat_short %}. + +## AI models for {% data variables.copilot.copilot_chat_short %} + +While {% data variables.copilot.copilot_auto_model_selection_short %} is an option for {% data variables.copilot.copilot_chat_short %}, you can manually choose a different model to override this selection. {% data reusables.copilot.change-the-ai-model %} + +## Multiplier discounts + +{% data reusables.copilot.auto-model-multiplier-discount %} See [AUTOTITLE](//copilot/concepts/billing/copilot-requests#model-multipliers). diff --git a/content/copilot/concepts/billing/copilot-requests.md b/content/copilot/concepts/billing/copilot-requests.md index 8806100c08..bc1d166deb 100644 --- a/content/copilot/concepts/billing/copilot-requests.md +++ b/content/copilot/concepts/billing/copilot-requests.md @@ -80,7 +80,10 @@ If you need more premium requests beyond your monthly allowance: The available models vary depending on your {% data variables.product.prodname_copilot_short %} plan. See [AUTOTITLE](/copilot/about-github-copilot/plans-for-github-copilot#models). > [!NOTE] -> The models included with {% data variables.product.prodname_copilot_short %} plans are subject to change. +> * The models included with {% data variables.product.prodname_copilot_short %} plans are subject to change. +> * Discounted multipliers are available for using {% data variables.copilot.copilot_auto_model_selection %} in {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode_shortname %}. See [AUTOTITLE](/copilot/concepts/auto-model-selection). +> * {% data reusables.copilot.auto-model-multiplier-discount %} For example, Sonnet 4 would be billed at .9x rather than 1x when using {% data variables.copilot.copilot_auto_model_selection_short %}. +> * Discounted multipliers are not available for {% data variables.copilot.copilot_free_short %}. Each model has a premium request multiplier, based on its complexity and resource usage. If you are on a paid {% data variables.product.prodname_copilot_short %} plan, your premium request allowance is deducted according to this multiplier. diff --git a/content/copilot/concepts/index.md b/content/copilot/concepts/index.md index a3a2d6aa90..5f5ee33ebb 100644 --- a/content/copilot/concepts/index.md +++ b/content/copilot/concepts/index.md @@ -17,6 +17,7 @@ children: - /billing - /prompt-engineering - /response-customization + - /auto-model-selection - /content-exclusion - /knowledge-bases - /extensions diff --git a/content/copilot/how-tos/use-ai-models/change-the-chat-model.md b/content/copilot/how-tos/use-ai-models/change-the-chat-model.md index bd38599b58..aa1d180d15 100644 --- a/content/copilot/how-tos/use-ai-models/change-the-chat-model.md +++ b/content/copilot/how-tos/use-ai-models/change-the-chat-model.md @@ -1,7 +1,7 @@ --- title: Changing the AI model for GitHub Copilot Chat shortTitle: Change the chat model -intro: 'Learn how to change the default LLM for {% data variables.copilot.copilot_chat_short %} to a different model.' +intro: 'Learn how to switch between models for {% data variables.copilot.copilot_chat_short %}.' versions: feature: copilot topics: @@ -13,9 +13,7 @@ redirect_from: contentType: how-tos --- -By default, {% data variables.copilot.copilot_chat_short %} uses {% data variables.copilot.copilot_gpt_41 %} to provide fast, capable responses for a wide range of tasks, such as summarization, knowledge-based questions, reasoning, math, and coding. - -However, you are not limited to using this model. You can choose from a selection of other models, each with its own particular strengths. You may have a favorite model that you like to use, or you might prefer to use a particular model for inquiring about a specific subject. +Choose from a selection of models, each with its own particular strengths. You may have a favorite model that you like to use, or you might prefer to use a particular model for inquiring about a specific subject. To view the available models per client, see [AUTOTITLE](/copilot/using-github-copilot/ai-models/supported-ai-models-in-copilot#supported-models-per-client). @@ -23,7 +21,7 @@ To view the available models per client, see [AUTOTITLE](/copilot/using-github-c {% data variables.product.prodname_copilot_short %} allows you to change the model during a chat and have the alternative model used to generate responses to your prompts. -Changing the model that's used by {% data variables.copilot.copilot_chat_short %} does not affect the model that's used for {% data variables.product.prodname_copilot_short %} code completion. See [AUTOTITLE](/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-code-completion). +Changing the model used by {% data variables.copilot.copilot_chat_short %} does not affect the model used for {% data variables.product.prodname_copilot_short %} code completion. See [AUTOTITLE](/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-code-completion). {% webui %} @@ -65,6 +63,8 @@ These instructions are for {% data variables.product.prodname_vscode %}. For ins {% data reusables.copilot.open-chat-vs-code %} 1. In the bottom right of the chat view, select the **CURRENT-MODEL** {% octicon "chevron-down" aria-hidden="true" aria-label="chevron-down" %} dropdown menu, then click the AI model of your choice. +> [!TIP] If you're already using chat with {% data variables.copilot.copilot_auto_model_selection_short %}, you'll need to start a new chat session to switch models. To start a new session, in the top right of the chat view, click {% octicon "plus" aria-label="new chat" %} new chat. + {% endvscode %} {% visualstudio %} diff --git a/content/copilot/how-tos/use-ai-models/configure-access-to-ai-models.md b/content/copilot/how-tos/use-ai-models/configure-access-to-ai-models.md index b90b6eb827..fe51fe6dd4 100644 --- a/content/copilot/how-tos/use-ai-models/configure-access-to-ai-models.md +++ b/content/copilot/how-tos/use-ai-models/configure-access-to-ai-models.md @@ -36,8 +36,11 @@ You can enable access in two ways: * You can enable the model directly in your personal settings on the {% data variables.product.github %} website. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-policies-as-an-individual-subscriber#enabling-or-disabling-alternative-ai-models). >[!NOTE] -> Some models may not be available depending on your plan. See [AUTOTITLE](/copilot/about-github-copilot/plans-for-github-copilot#models). +> * Some models may not be available depending on your plan. See [AUTOTITLE](/copilot/about-github-copilot/plans-for-github-copilot#models). +> * Models available in {% data variables.copilot.copilot_auto_model_selection %} will follow the policies set by users and align to individual plans. See [AUTOTITLE](/copilot/concepts/auto-model-selection). ## Setup for organization and enterprise use As an enterprise or organization owner, you can enable or disable access to AI models for everyone who has been assigned a {% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %} seat through your enterprise or organization. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/setting-policies-for-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization) and [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise). + +> [!NOTE] Models available in {% data variables.copilot.copilot_auto_model_selection %} will follow the policies set for an organization or enterprise. See [AUTOTITLE](/copilot/concepts/auto-model-selection). diff --git a/content/copilot/reference/ai-models/model-comparison.md b/content/copilot/reference/ai-models/model-comparison.md index 8d574ac63f..b5359df96e 100644 --- a/content/copilot/reference/ai-models/model-comparison.md +++ b/content/copilot/reference/ai-models/model-comparison.md @@ -17,7 +17,9 @@ contentType: reference {% data variables.product.prodname_copilot %} supports multiple AI models with different capabilities. The model you choose affects the quality and relevance of responses by {% data variables.copilot.copilot_chat_short %} and {% data variables.product.prodname_copilot_short %} code completion. Some models offer lower latency, while others offer fewer hallucinations or better performance on specific tasks. This guide helps you pick the best model based on your task, not just model names. -> [!NOTE] Different models have different premium request multipliers, which can affect how much of your monthly usage allowance is consumed. For details, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests). +> [!NOTE] +> * Different models have different premium request multipliers, which can affect how much of your monthly usage allowance is consumed. For details, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests). +> * {% data reusables.copilot.auto-model-selection %} ### Recommended models by task diff --git a/content/copilot/reference/ai-models/supported-models.md b/content/copilot/reference/ai-models/supported-models.md index 8c37ee7bcf..fa988d5505 100644 --- a/content/copilot/reference/ai-models/supported-models.md +++ b/content/copilot/reference/ai-models/supported-models.md @@ -60,6 +60,8 @@ This table lists the AI models available in {% data variables.product.prodname_c The following table shows which models are available in each client. +> [!NOTE] {% data reusables.copilot.auto-model-selection %} + {% rowheaders %} | Model | {% data variables.product.prodname_dotcom_the_website %} | {% data variables.product.prodname_vscode %} | {% data variables.product.prodname_vs %} | Eclipse | Xcode | JetBrains IDEs | diff --git a/data/reusables/copilot/auto-model-multiplier-discount.md b/data/reusables/copilot/auto-model-multiplier-discount.md new file mode 100644 index 0000000000..d6d856f139 --- /dev/null +++ b/data/reusables/copilot/auto-model-multiplier-discount.md @@ -0,0 +1 @@ +If you are on a {% data variables.copilot.copilot_pro %} or {% data variables.copilot.copilot_pro_plus %} plan, and use {% data variables.copilot.copilot_auto_model_selection_short %}, models qualify for a 10% multiplier discount. diff --git a/data/reusables/copilot/auto-model-selection.md b/data/reusables/copilot/auto-model-selection.md new file mode 100644 index 0000000000..8d0c6fc596 --- /dev/null +++ b/data/reusables/copilot/auto-model-selection.md @@ -0,0 +1 @@ +When you use {% data variables.copilot.copilot_chat_short %} in {% data variables.product.prodname_vscode_shortname %}, it automatically selects the best model for you based on availability. You can manually choose a different model to override this selection. See [AUTOTITLE](/copilot/concepts/auto-model-selection) and [AUTOTITLE](/copilot/how-tos/use-ai-models/change-the-chat-model?tool=vscode). diff --git a/data/reusables/copilot/change-the-ai-model.md b/data/reusables/copilot/change-the-ai-model.md index 31400e603d..a7b7a27714 100644 --- a/data/reusables/copilot/change-the-ai-model.md +++ b/data/reusables/copilot/change-the-ai-model.md @@ -1 +1 @@ -You can change the large language model that {% data variables.product.prodname_copilot_short %} uses to generate responses to chat prompts, including premium models with advanced capabilities. You may find that different models perform better, or provide more useful responses, depending on the type of questions you ask. For more information see [AUTOTITLE](/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-chat). +You can change the model {% data variables.product.prodname_copilot_short %} uses to generate responses to chat prompts. You may find that different models perform better, or provide more useful responses, depending on the type of questions you ask. Options include premium models with advanced capabilities. See [AUTOTITLE](/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-chat). diff --git a/data/variables/copilot.yml b/data/variables/copilot.yml index 9f50030cc0..dd1a4be3bc 100644 --- a/data/variables/copilot.yml +++ b/data/variables/copilot.yml @@ -56,6 +56,9 @@ copilot_agent_short: 'Copilot agent' copilot_agents_short: 'Copilot agents' copilot_agents: 'GitHub Copilot agents' copilot_autocomplete_pr: 'Copilot text completion' +copilot_auto_model_selection: 'Copilot auto model selection' +copilot_auto_model_selection_short: 'auto model selection' +copilot_auto_model_selection_short_cap_a: 'Auto model selection' copilot_chat_dotcom_short: 'Copilot Chat in GitHub' copilot_chat_dotcom: 'GitHub Copilot Chat in GitHub' copilot_chat_short: 'Copilot Chat' From 0e8264789e1fc2beb5ff56fcf99f681968fd79c5 Mon Sep 17 00:00:00 2001 From: Felix Guntrip Date: Thu, 11 Sep 2025 16:01:35 +0100 Subject: [PATCH 3/3] Update reasons why you can't delete an enterprise account (#57483) --- .../deleting-an-enterprise-account.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md b/content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md index 4e0edceda4..796b8e75ee 100644 --- a/content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md +++ b/content/admin/managing-your-enterprise-account/deleting-an-enterprise-account.md @@ -14,9 +14,16 @@ redirect_from: - /admin/overview/deleting-an-enterprise-account --- -## Can I delete my enterprise account? +## Prerequisites -Only self-serve {% data variables.product.prodname_enterprise %} customers can delete their enterprise account. If your company pays via invoice, and you want to stop paying for {% data variables.product.prodname_enterprise %} altogether, contact {% data variables.contact.contact_enterprise_sales %}. +You must remove, transfer, or delete all organizations in the enterprise before you can delete the enterprise account. For more information, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise#transferring-an-organization-between-enterprise-accounts) and [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise). + +You cannot delete an enterprise account if any of the following apply: + +* The enterprise account is paid via invoice. +* The enterprise account is currently in a trial period. + +If either of these apply to your enterprise account, you can contact {% data variables.contact.contact_enterprise_sales %} to discuss deleting the account. ## What happens when I delete the account? @@ -28,10 +35,6 @@ When you delete your enterprise account, you lose the policies, billing settings If you upgraded to an enterprise account from a single organization and then delete that enterprise account, the associated billing history will also be deleted. We recommend that you save any important billing information before deleting your enterprise account. -## Prerequisites - -You must remove, transfer, or delete all organizations in the enterprise before you can delete the enterprise account. For more information, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise#transferring-an-organization-between-enterprise-accounts) and [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise). - ## Deleting an enterprise account on {% data variables.product.prodname_dotcom %} {% data reusables.enterprise-accounts.access-enterprise %}