Skip to content

Commit e4859a8

Browse files
authored
Merge pull request #46133 from github/repo-sync
Repo sync
2 parents 8ceedbb + b8433f1 commit e4859a8

21 files changed

Lines changed: 347 additions & 83 deletions

File tree

‎.github/instructions/instruction-architecture.instructions.md‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,36 @@ applyTo: ".github/instructions/**,.github/agents/**"
44

55
# Editing Copilot content instruction and agent files
66

7-
This applies when you add, edit, or remove a Copilot instruction or shared agent file that guides how **content** (articles, data files) is written. It does **not** apply to code instructions or agents owned by the engineering team (for example `code.instructions.md`).
7+
This applies when you add, edit, review, or remove a Copilot instruction or shared agent file that guides how **content** (articles, data files) is written. It does **not** apply to code instructions or agents owned by the engineering team (for example `code.instructions.md`).
88

9-
When it applies, you **must** first read the instruction-architecture doc in full and follow it:
9+
Content-writing guidance goes in one of two places. Decide which before writing anything.
1010

11-
https://github.com/github/technical-content/blob/main/contributing-to-docs/docs-work/copilot-instruction-architecture.md
11+
## Always-on instruction files (`.github/instructions/*.instructions.md`)
1212

13-
Read the current version every time (from a local `github/technical-content` checkout if you have one, otherwise fetch the URL); do not rely on your memory of it, because it changes. If you cannot access it, say so and stop rather than guessing.
13+
These load automatically into every Copilot interaction whose files match the `applyTo` pattern. Use them only for rules that apply to every content interaction, regardless of persona, task, or phase.
14+
15+
* Keep the always-on set that loads for content under roughly **150 discrete rules**, with a soft backstop of **~6,500 tokens**. Rule count matters more, because adherence slips as the number of instructions grows. Both are soft warnings: slightly over is fine. Run `npm run measure-instruction-budget` to see where a change lands, and report the before and after numbers.
16+
* Front-load the most important rules. Rules earlier in a file are followed more reliably, and the order in which separate files are combined is not guaranteed.
17+
* A rule earns a spot only if it scores well on these factors:
18+
* **Model default gap**: The model consistently gets it wrong without the rule.
19+
* **Breadth**: It applies to every content interaction, not just some personas, tasks, or phases.
20+
* **Cost of missing it**: Getting it wrong causes expensive rework (wrong audience, wrong scope), not polish that is cheap to catch in review.
21+
* **Conciseness**: It fits in one or two short, actionable rules.
22+
* Write rules as short imperatives, not multi-paragraph explanations.
23+
24+
## Shared agent files (`.github/agents/`)
25+
26+
Writers invoke these deliberately. Each agent has its own budget (up to 30,000 characters), so guidance that is narrow, detailed, or needs room to explain goes here. There are three kinds:
27+
28+
* **Persona agents** target a specific audience: `builder-writer` (developers building software) and `driver-writer` (admins and decision-makers enabling developers at scale).
29+
* **Task agents** help with a specific type of work, such as a content design plan or release notes.
30+
* **Review agents** give a focused editing pass on existing content, such as readability.
31+
32+
Use agents, not skills, for docs-writing guidance. Skills can be invoked automatically and unpredictably, which undermines consistent output across the team.
33+
34+
## Always
35+
36+
* Do not duplicate guidance that already exists in another instruction file or shared agent. Check before adding.
37+
* Keep content-writing guidance in these shared files, never in personal instructions, so it stays consistent across the team.
38+
39+
The reasoning behind these rules is written up for humans at https://github.com/github/technical-content/blob/main/contributing-to-docs/docs-work/copilot-instruction-architecture.md. You do not need to read it to follow them.

‎.github/workflows/reviewers-docs-engineering.yml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
name: Reviewers - Docs Engineering
1+
name: Add engineering PRs to review board
22

3-
# **What it does**: Automatically add reviewers based on paths, but only for the docs-internal repo.
4-
# And sets the 'engineering' label on the PR. It also edits the PR body to add a template
5-
# for asking questions for the sake of being confident about the PRs rollout.
6-
# **Why we have it**: So we can have reviewers automatically without getting open source notifications.
7-
# **Who does it impact**: Docs team.
3+
# Routes non-draft engineering PRs to the Docs & Blog Engineering PR Reviews board for triage.
4+
# Labels each PR, so later pushes skip board work unless the PR reopens.
85

96
on:
107
pull_request:
@@ -19,9 +16,9 @@ on:
1916
- '**.tsx'
2017
- '**.scss'
2118
- 'src/**'
22-
- '!src/**.json' # So that Docs Engineering isn't reviewing automated pipeline data PRs
23-
- '!src/**.yml' # So that Docs Engineering isn't reviewing automated pipeline data PRs
24-
- '!src/**.sha' # So that Docs Engineering isn't reviewing automated pipeline data PRs
19+
- '!src/**.json' # Docs Engineering does not triage automated pipeline data PRs.
20+
- '!src/**.yml' # Docs Engineering does not triage automated pipeline data PRs.
21+
- '!src/**.sha' # Docs Engineering does not triage automated pipeline data PRs.
2522
- '.github/**'
2623
- 'config/**'
2724
- '.devcontainer/**'
@@ -39,7 +36,8 @@ jobs:
3936
if: >-
4037
${{ github.repository == 'github/docs-internal' &&
4138
!github.event.pull_request.draft &&
42-
!contains(github.event.pull_request.labels.*.name, 'reviewers-docs-engineering') &&
39+
(github.event.action == 'reopened' ||
40+
!contains(github.event.pull_request.labels.*.name, 'reviewers-docs-engineering')) &&
4341
!contains(github.event.pull_request.labels.*.name, 'lockfile-churn-only') &&
4442
github.event.pull_request.head.ref != 'repo-sync' }}
4543
runs-on: ubuntu-latest
@@ -52,13 +50,13 @@ jobs:
5250

5351
# Detect PRs that only changed package-lock.json (no engineering source files).
5452
# These are usually cross-platform `npm install` churn from contributors
55-
# editing content. We comment with reset instructions instead of pulling in
56-
# docs-engineering for review.
53+
# editing content. We comment with reset instructions instead of adding
54+
# them to the engineering review board.
5755
#
5856
# Dependabot is exempt. Its security updates for transitive dependencies
5957
# change only the lockfile, because the dependency is not in package.json.
6058
# Those PRs are intentional, so the reset instructions are wrong and
61-
# suppressing the review request leaves them with no reviewer at all.
59+
# keeping them off the board leaves them without engineering triage.
6260
- name: Detect lockfile-only churn
6361
id: detect
6462
env:
@@ -97,15 +95,19 @@ jobs:
9795
git push
9896
```
9997
100-
If the lockfile change is intentional, remove the `lockfile-churn-only` label and request docs-engineering review.
98+
If the lockfile change is intentional, remove the `lockfile-churn-only` label and push or reopen the PR so this workflow sends it to the engineering review board.
10199
EOF
102100
gh pr comment "$PR" --body-file /tmp/lockfile-churn-body.md
103101
gh pr edit "$PR" --add-label lockfile-churn-only
104102
105-
- name: Add docs engineering as a reviewer
103+
- name: Add PR to board and label
106104
if: steps.detect.outputs.lockfile_only != 'true'
107105
env:
108106
GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
107+
REPO: ${{ github.repository }}
108+
PR_NUMBER: ${{ github.event.pull_request.number }}
109109
uses: ./.github/actions/retry-command
110110
with:
111-
command: gh pr edit $PR --add-reviewer github/docs-engineering --add-label reviewers-docs-engineering
111+
command: >-
112+
gh project item-add 25672 --owner github --url "$PR" &&
113+
gh api "repos/$REPO/issues/$PR_NUMBER/labels" -f 'labels[]=reviewers-docs-engineering' --silent

‎content/copilot/reference/ai-models/model-hosting.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Used for:
3030
* {% data variables.copilot.copilot_gpt_6_astra %}
3131
* {% data variables.copilot.copilot_gpt_6_luna %}
3232
* {% data variables.copilot.copilot_gpt_6_sol %}
33+
* {% data variables.copilot.copilot_gpt_61_sol %}
3334

3435
These models are hosted by OpenAI and {% data variables.product.github %}'s Azure infrastructure.
3536

‎content/copilot/reference/ai-models/supported-models.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Choosing a larger context window or higher reasoning will impact {% data variabl
9797
| {% data variables.copilot.copilot_gpt_6_astra %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
9898
| {% data variables.copilot.copilot_gpt_6_luna %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
9999
| {% data variables.copilot.copilot_gpt_6_sol %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
100+
| {% data variables.copilot.copilot_gpt_61_sol %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
100101
| {% data variables.copilot.copilot_kimi_k3 %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
101102

102103
{% endrowheaders %}
@@ -140,6 +141,7 @@ Some {% data variables.product.prodname_copilot_short %} models require minimum
140141
| {% data variables.copilot.copilot_gpt_6_astra %} | `1.136.1` | `17.14.19` | TBD | TBD | TBD |
141142
| {% data variables.copilot.copilot_gpt_6_luna %} | TBD | `17.14.19` | TBD | TBD | TBD |
142143
| {% data variables.copilot.copilot_gpt_6_sol %} | TBD | `17.14.19` | TBD | TBD | TBD |
144+
| {% data variables.copilot.copilot_gpt_61_sol %} | TBD | `17.14.19` | TBD | TBD | TBD |
143145
| {% data variables.copilot.copilot_claude_opus_48 %} | `v1.118` | `17.14.6` | TBD | TBD | TBD |
144146
| {% data variables.copilot.copilot_claude_opus_5 %} | `v1.128.0` | `17.14.22` | TBD | TBD | TBD |
145147
| {% data variables.copilot.copilot_claude_opus_55 %} | TBD | `17.14.6` | TBD | TBD | TBD |

‎content/copilot/reference/copilot-billing/models-and-pricing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ All prices are **per 1 million tokens**.
3333

3434
{% data reusables.copilot.extended-context-pricing %}
3535

36-
{% data variables.copilot.copilot_gpt_56_sol %}, {% data variables.copilot.copilot_gpt_56_terra %}, {% data variables.copilot.copilot_gpt_56_luna %}, {% data variables.copilot.copilot_gpt_6_astra %}, {% data variables.copilot.copilot_gpt_6_luna %}, and {% data variables.copilot.copilot_gpt_6_sol %} include a cache write cost in addition to cached input. Earlier OpenAI models have no cache write cost.
36+
{% data variables.copilot.copilot_gpt_56_sol %}, {% data variables.copilot.copilot_gpt_56_terra %}, {% data variables.copilot.copilot_gpt_56_luna %}, {% data variables.copilot.copilot_gpt_6_astra %}, {% data variables.copilot.copilot_gpt_6_luna %}, {% data variables.copilot.copilot_gpt_6_sol %}, and {% data variables.copilot.copilot_gpt_61_sol %} include a cache write cost in addition to cached input. Earlier OpenAI models have no cache write cost.
3737

3838
| Model | Release status | Category | Tier | Threshold (input tokens) | Input | Cached input | Cache write | Output |
3939
| --- | --- | --- | --- | --- | ---: | ---: | ---: | ---: |

‎data/reusables/copilot/copilot-cloud-agent-non-auto-models.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* {% data variables.copilot.copilot_gpt_6_astra %}
1515
* {% data variables.copilot.copilot_gpt_6_luna %}
1616
* {% data variables.copilot.copilot_gpt_6_sol %}
17+
* {% data variables.copilot.copilot_gpt_61_sol %}
1718
* {% data variables.copilot.copilot_grok_45 %}
1819
* {% data variables.copilot.copilot_grok_46 %}
1920
* {% data variables.copilot.copilot_grok_47 %}

‎data/tables/copilot/model-comparison.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,16 @@
5656
- name: GPT-6 Luna
5757
task_area: Fast help with simple or repetitive tasks
5858
excels_at: Quick, cost-efficient responses for smaller, faster tasks
59-
further_reading: 'Coming soon'
59+
further_reading: '[GPT-6 Luna model card](https://deploymentsafety.openai.com/gpt-6-astra/gpt-6-astra.pdf)'
6060

6161
- name: GPT-6 Sol
6262
task_area: Interactive and agentic coding
6363
excels_at: All-round development tasks that benefit from careful, multistep validation
64+
further_reading: '[GPT-6 Sol model card](https://deploymentsafety.openai.com/gpt-6-astra/gpt-6-astra.pdf)'
65+
66+
- name: GPT-6.1 Sol
67+
task_area: Complex coding tasks
68+
excels_at: Advanced, efficient reasoning for complex coding tasks
6469
further_reading: 'Coming soon'
6570

6671
# Anthropic

‎data/tables/copilot/model-release-status.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
provider: 'OpenAI'
6464
release_status: 'GA'
6565

66+
- name: 'GPT-6.1 Sol'
67+
provider: 'OpenAI'
68+
release_status: 'GA'
69+
6670
# Anthropic models
6771

6872
- name: 'Claude Fable 5'

‎data/tables/copilot/model-supported-plans.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,13 @@
201201
business: true
202202
enterprise: true
203203

204+
- name: GPT-6.1 Sol
205+
pro: false
206+
pro_plus: true
207+
max: true
208+
business: true
209+
enterprise: true
210+
204211
- name: Grok 4.5
205212
pro: true
206213
pro_plus: true

‎data/tables/copilot/models-and-pricing.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,28 @@
240240
output: $15.00
241241
cache_write: $5.00
242242

243+
- model: GPT-6.1 Sol
244+
provider: openai
245+
release_status: GA
246+
category: Powerful
247+
threshold: '≤ 272K'
248+
tier: Default
249+
input: $2.00
250+
cached_input: $0.10
251+
output: $10.00
252+
cache_write: $2.50
253+
254+
- model: GPT-6.1 Sol
255+
provider: openai
256+
release_status: GA
257+
category: Powerful
258+
threshold: '> 272K'
259+
tier: 'Long context'
260+
input: $4.00
261+
cached_input: $0.20
262+
output: $15.00
263+
cache_write: $5.00
264+
243265
# Anthropic
244266
- model: Claude Haiku 4.5
245267
provider: anthropic

0 commit comments

Comments
 (0)