Merge branch 'main' into docs-issue-cross-referencing-42376

Author: XiaoPengMei

.github/workflows/benchmark-pages.yml

@@ -0,0 +1,170 @@
+name: 'Weekly page benchmark'
+
+# **What it does**: Benchmarks all pages via the article API, flags errors and slow pages
+# **Why we have it**: Catch perf regressions and broken pages before users hit them
+# **Who does it impact**: Docs engineering
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '20 16 * * 1' # Every Monday at 16:20 UTC / 8:20 PST
+
+permissions:
+  contents: read
+
+jobs:
+  benchmark:
+    if: github.repository == 'github/docs-internal'
+    runs-on: ubuntu-latest
+    env:
+      BENCHMARK_LABEL: benchmark-regression
+      ISSUE_REPO: github/docs-engineering
+    steps:
+      - name: Checkout
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        with:
+          persist-credentials: 'false'
+
+      - uses: ./.github/actions/node-npm-setup
+
+      - name: Build
+        run: npm run build
+
+      - name: Start server
+        env:
+          NODE_ENV: production
+          PORT: 4000
+        run: |
+          npm run start-for-ci &
+          sleep 5
+          curl --retry-connrefused --retry 6 -I http://localhost:4000/
+
+      - name: Run benchmark
+        run: |
+          npx tsx src/workflows/benchmark-pages.ts \
+            --versions "free-pro-team@latest,enterprise-cloud@latest,enterprise-server@latest" \
+            --modes article-body \
+            --slow 500 \
+            --json /tmp/benchmark-results.json | tee /tmp/benchmark-output.txt
+
+      - name: Check results and create issue if needed
+        if: always()
+        env:
+          GH_TOKEN: ${{ secrets.DOCS_BOT_PAT_BASE }}
+          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        run: |
+          echo "Reading benchmark results..."
+          ERRORS=$(jq '.errors | length' /tmp/benchmark-results.json 2>/dev/null || echo "0")
+          SLOW=$(jq '.slow | length' /tmp/benchmark-results.json 2>/dev/null || echo "0")
+          TOTAL=$(jq '.totalRequests' /tmp/benchmark-results.json 2>/dev/null || echo "0")
+          P50=$(jq '.p50' /tmp/benchmark-results.json 2>/dev/null || echo "0")
+          P99=$(jq '.p99' /tmp/benchmark-results.json 2>/dev/null || echo "0")
+          MAX=$(jq '.max' /tmp/benchmark-results.json 2>/dev/null || echo "0")
+          echo "Done reading results: $TOTAL pages, $ERRORS errors, $SLOW slow"
+
+          VERSIONS="free-pro-team@latest, enterprise-cloud@latest, enterprise-server@latest"
+          LANGS="en"
+
+          if [ "$ERRORS" = "0" ] && [ "$SLOW" = "0" ]; then
+            echo "✅ All clear — $TOTAL pages, p50=${P50}ms, p99=${P99}ms, max=${MAX}ms"
+
+            echo "Checking for existing open issue..."
+            existing=$(gh issue list \
+              --repo "$ISSUE_REPO" \
+              --label "$BENCHMARK_LABEL" \
+              --state open \
+              --json number \
+              --jq '.[0].number // empty' 2>/dev/null || true)
+            if [ -n "$existing" ]; then
+              echo "Closing issue #$existing..."
+              gh issue close "$existing" \
+                --repo "$ISSUE_REPO" \
+                --comment "All clear as of $RUN_URL — closing."
+              echo "Done closing issue #$existing"
+            else
+              echo "No existing issue to close"
+            fi
+            exit 0
+          fi
+
+          PROBLEM_COUNT=$((ERRORS + SLOW))
+          echo "Found $ERRORS errors and $SLOW slow pages ($PROBLEM_COUNT total problems)"
+
+          echo "Ensuring label exists..."
+          gh label create "$BENCHMARK_LABEL" \
+            --repo "$ISSUE_REPO" \
+            --description "Weekly page benchmark found slow or errored pages" \
+            --color "e16f24" 2>/dev/null || true
+          echo "Done ensuring label"
+
+          echo "Building issue body..."
+          BODY_FILE=/tmp/benchmark-issue-body.md
+          {
+            echo "## Weekly page benchmark found issues"
+            echo ""
+            echo "**Run:** $RUN_URL"
+            echo "**Languages:** $LANGS"
+            echo "**Versions:** $VERSIONS"
+            echo "**Total pages:** $TOTAL"
+            echo "**Stats:** p50=${P50}ms · p99=${P99}ms · max=${MAX}ms"
+            echo "**Errors:** $ERRORS"
+            echo "**Slow (≥500ms):** $SLOW"
+          } > "$BODY_FILE"
+
+          if [ "$ERRORS" -gt 0 ]; then
+            {
+              echo ""
+              echo "### Errors"
+              echo ""
+              echo "| Status | Mode | Path |"
+              echo "|--------|------|------|"
+              jq -r '.errors[] | "| \(.status) | \(.mode) | \(.path) |"' /tmp/benchmark-results.json
+            } >> "$BODY_FILE"
+          fi
+
+          if [ "$SLOW" -gt 0 ]; then
+            {
+              echo ""
+              echo "### Slow pages"
+              echo ""
+              echo "| Time | Mode | Path |"
+              echo "|------|------|------|"
+              jq -r '.slow[] | "| \(.timeMs)ms | \(.mode) | \(.path) |"' /tmp/benchmark-results.json
+            } >> "$BODY_FILE"
+          fi
+          echo "Done building issue body"
+
+          echo "Checking for existing open issue..."
+          existing=$(gh issue list \
+            --repo "$ISSUE_REPO" \
+            --label "$BENCHMARK_LABEL" \
+            --state open \
+            --json number \
+            --jq '.[0].number // empty' 2>/dev/null || true)
+
+          if [ -n "$existing" ]; then
+            echo "Commenting on existing issue #$existing..."
+            gh issue comment "$existing" \
+              --repo "$ISSUE_REPO" \
+              --body-file "$BODY_FILE"
+            echo "Done commenting on issue #$existing"
+          else
+            echo "Creating new issue..."
+            gh issue create \
+              --repo "$ISSUE_REPO" \
+              --label "$BENCHMARK_LABEL" \
+              --title "[Benchmark] ${PROBLEM_COUNT} slow or errored pages detected" \
+              --body-file "$BODY_FILE"
+            echo "Done creating issue"
+          fi
+
+      - uses: ./.github/actions/slack-alert
+        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
+        with:
+          slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
+          slack_token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}
+
+      - uses: ./.github/actions/create-workflow-failure-issue
+        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
+        with:
+          token: ${{ secrets.DOCS_BOT_PAT_BASE }}

.github/workflows/content-pipelines.yml

@@ -71,12 +71,12 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
           if git ls-remote --exit-code --heads origin "$UPDATE_BRANCH" > /dev/null 2>&1; then
-            git fetch origin "$UPDATE_BRANCH" main
+            git fetch --unshallow origin "$UPDATE_BRANCH" main 2>/dev/null || git fetch origin "$UPDATE_BRANCH" main
             git checkout "$UPDATE_BRANCH"
             git merge origin/main --no-edit || {
               echo "Merge conflict with main — resetting branch to main"
               git merge --abort 2>/dev/null || true
-              git checkout main
+              git checkout -f main
               git branch -D "$UPDATE_BRANCH"
               if [ -z "$PR_NUMBER" ]; then
                 git push origin --delete "$UPDATE_BRANCH" || true

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Docs changelog
 
+**26 March 2026**
+
+If you use both Copilot CLI and VS Code, when you start the CLI it will automatically connect to a currently open VS Code workspace that matches the directory in which you're using the CLI. You can also manually connect to VS Code by using the `/ide` slash command.
+
+This new article documents this feature and outlines the benefits of sharing context, trust settings, and output between Copilot CLI and VS Code:
+
+[Connecting GitHub Copilot CLI to VS Code](https://docs.github.com/en/copilot/how-tos/copilot-cli/connecting-vs-code)
+
+<hr>
+
 **23 March 2026**
 
 We've added an article with details of the various command-line options for allowing/denying tools that Copilot CLI can use.

Dockerfile

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20260320-170214-g814cb7830@sha256:90350e63f9b56ec3f60f5ef9f51b489c4eef6462c7727e0d6729a1c8d95a4aa7 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260326-105710-g59112a0a7@sha256:ba809251141daf76a02c7c064ae2c3b27a904f2f62b16582f62fe4328267f38f AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-support-bundles.md

@@ -72,7 +72,7 @@ Support bundles are designed to help diagnose issues while protecting sensitive
 * **User data**: Support bundles don't include user profile information beyond what appears in system logs.
 * **License information**: The bundle includes your organization name and license reference so {% data variables.contact.github_support %} can identify your instance.
 
-When you provide a support bundle to {% data variables.contact.github_support %}, {% data variables.product.company_short %} uses the data only to address your support request. {% data variables.product.company_short %} won't disclose your data to third parties without your explicit consent unless required by law.
+When you provide a support bundle to {% data variables.contact.github_support %}, {% data variables.product.company_short %} uses the data only to address your support request. For details on how {% data variables.product.company_short %} handles your data, see the [{% data variables.product.company_short %} Privacy Statement](https://github.com/site/privacy).
 
 ## Support bundle size and generation time
 

content/code-security/how-tos/secure-your-supply-chain/manage-your-dependency-security/customizing-dependabot-security-prs.md

@@ -127,6 +127,11 @@ updates:
     assignees:
       - "user-name"
   - package-ecosystem: "gomod"
+    directories:
+      - "**/*"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 0
     groups:
       # Group security updates for golang dependencies
       # into a single pull request

content/code-security/how-tos/secure-your-supply-chain/secure-your-dependencies/configuring-dependabot-security-updates.md

@@ -110,6 +110,11 @@ updates:
     registries:
       - example
   - package-ecosystem: "gomod"
+    directories:
+      - "**/*"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 0
     groups:
       golang:
         applies-to: security-updates
@@ -118,7 +123,7 @@ updates:
 ```
 
 > [!NOTE]
-> In order for {% data variables.product.prodname_dependabot %} to use this configuration for security updates, the `directory` must be the path to the manifest files, and you should not specify a `target-branch`.
+> In order for {% data variables.product.prodname_dependabot %} to use this configuration for security updates, the `directory` must be the path to the manifest files (or `directories` must contain paths or glob patterns matching the manifest file locations), and you should not specify a `target-branch`.
 
 ## Further reading
 

content/copilot/concepts/agents/about-agent-skills.md

@@ -12,7 +12,7 @@ contentType: concepts
 ---
 
 > [!NOTE]
-> Agent Skills work with {% data variables.copilot.copilot_coding_agent %}, the {% data variables.copilot.copilot_cli %} and agent mode in {% data variables.product.prodname_vscode %} Insiders. Support in the stable version of {% data variables.product.prodname_vscode_shortname %} is coming soon.
+> Agent skills work with {% data variables.copilot.copilot_coding_agent %}, the {% data variables.copilot.copilot_cli %}, and agent mode in {% data variables.product.prodname_vscode %}.
 
 ## About agent skills
 
@@ -22,8 +22,8 @@ You can create your own skills to teach {% data variables.product.prodname_copil
 
 {% data variables.product.prodname_copilot_short %} supports:
 
-* Project skills, stored in your repository (`.github/skills` or `.claude/skills`)
-* Personal skills, stored in your home directory and shared across projects (`~/.copilot/skills` or `~/.claude/skills`) ({% data variables.copilot.copilot_coding_agent %} and {% data variables.copilot.copilot_cli %} only)
+* Project skills, stored in your repository (`.github/skills`, `.claude/skills`, or `.agents/skills`)
+* Personal skills, stored in your home directory and shared across projects (`~/.copilot/skills`, `~/.claude/skills`, or `~/.agents/skills`)
 
 Support for organization-level and enterprise-level skills is coming soon.