Skip to content

Commit bee3a74

Browse files
authored
Merge branch 'main' into fix/notebook-editor-card-clip
2 parents 94ddf25 + 3aa5403 commit bee3a74

943 files changed

Lines changed: 52276 additions & 12760 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/instructions/best-practices.instructions.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ applyTo: src/vs/**
2323

2424
- Don't use context keys as a source of truth for application logic (for example, by reading `IContextKeyService.getContextKeyValue()` and branching on the result). Read the state from its owning service or model instead. Context keys are intended for declarative enablement and visibility, such as when clauses, command preconditions, and menu contributions.
2525

26+
## Multi-Window DOM
27+
28+
- Always create workbench DOM elements in the main window JavaScript realm, including elements that will be rendered in an auxiliary window. Use helpers such as `dom.$` and `dom.h`, or use `mainWindow.document.createElement`. Do not use `targetWindow.document.createElement` or `element.ownerDocument.createElement`; auxiliary windows intentionally reject `createElement` so that checks such as `element instanceof HTMLElement` continue to work.
29+
- This rule applies to DOM element creation, not to window-bound APIs. Resolve the target window with `dom.getWindow(element)` when using APIs such as timers, animation frames, focus, observers, or `getComputedStyle`.
30+
2631
## URI
2732

2833
- Don't hardcode URI scheme strings like `'file'`, `'untitled'`, or `'vscode-remote'`. Use the `Schemas` constants from `vs/base/common/network.ts` (e.g. `Schemas.file`, `Schemas.untitled`, `Schemas.vscodeRemote`).
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
description: Use when writing or reviewing model-facing language model tool descriptions.
3+
applyTo: "src/vs/**/*Tool.ts,src/vs/**/*Tools.ts"
4+
---
5+
6+
# Language model tool descriptions
7+
8+
Apply these rules only when adding or changing a model-facing tool description, such as `modelDescription`. They do not govern display names, user-facing messages, confirmation text, or routine schema property descriptions.
9+
10+
- Begin with a direct imperative statement of the tool's capability.
11+
- When tool selection could be ambiguous, state the positive invocation criteria explicitly.
12+
- Place exclusions for likely near-neighbor requests immediately after the positive criteria.
13+
- Describe persistent, external, costly, or otherwise consequential side effects.
14+
- State meaningful defaults, cross-field requirements, and prerequisite tool calls that are not obvious from the input schema.
15+
- Put approval, cancellation, retry, repeat-call, and polling guidance last.
16+
- Do not repeat the complete input schema in prose.
17+
- Keep descriptions concise and scale their detail with the ambiguity and cost of incorrect selection.
18+
- Preserve terminology and formatting conventions used by related tools.
19+
- Reserve `MUST`, `ONLY`, `CRITICAL`, and direct "Do not" language for likely, consequential misuse.
20+
21+
When correctness depends on specific model-facing guidance, add a focused test for the required semantic clauses. Prefer checking a small set of meaningful phrases or conditions over snapshotting the entire description. Do not test routine descriptive prose.

‎.github/instructions/source-code-organization.instructions.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,6 @@ class MyComponent {
6464
}
6565
```
6666

67+
Decorated service parameters must use their canonical service interface. Do not invent local subset interfaces or `Pick<...>` aliases in production to simplify tests; keep partial stubs, adapters, and other test-only conveniences in test code.
68+
6769
Services are provided via `registerSingleton(IMyService, MyServiceImpl, InstantiationType.Delayed)`.

‎.github/skills/agent-host-chat-contributions/SKILL.md‎

Lines changed: 105 additions & 33 deletions
Large diffs are not rendered by default.

‎.github/skills/policy-and-managed-settings/local-testing.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ Choose the client setup in the GUI:
2828
proxy mapping and enable Proxyman's platform proxy toggle (**Tools > macOS
2929
Proxy** or **Tools > Override Windows Proxy**). VS Code clients must also add
3030
the displayed `http.proxy` property to `settings.json`.
31+
- **File-based settings (no proxy):** expand **Deploy as a file** under the
32+
Managed Settings response body and run the copied per-platform command to write
33+
the current body to `managed-settings.json` on the device. Restart the client to
34+
load it. Use it to skip proxying or to test precedence against a server-managed
35+
response. See [Deploying file-based settings](https://docs.github.com/en/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-agents/configure-enterprise-managed-settings#deploying-file-based-settings).
3136

3237
Use **Clear SDK Policy Cache**, expand the macOS or Windows section, and run the
3338
copied command when the runtime's fresh managed-settings cache prevents a network

‎.github/workflows/chat-lib-package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
26+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2727

2828
- name: Setup Node.js
29-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
29+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
3030
with:
3131
node-version-file: extensions/copilot/.nvmrc
3232
cache: npm

‎.github/workflows/chat-perf.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ jobs:
9393
fi
9494
9595
- name: Checkout
96-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
96+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
9797
with:
9898
ref: ${{ steps.resolve.outputs.is_version != 'true' && inputs.test_build || github.ref }}
9999

100100
- name: Setup Node.js
101-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
101+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
102102
with:
103103
node-version-file: .nvmrc
104104
cache: npm
@@ -212,12 +212,12 @@ jobs:
212212
matrix: ${{ fromJSON(needs.setup.outputs.perf_matrix) }}
213213
steps:
214214
- name: Checkout
215-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
215+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
216216
with:
217217
ref: ${{ needs.setup.outputs.test_is_version != 'true' && inputs.test_build || github.ref }}
218218

219219
- name: Setup Node.js
220-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
220+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
221221
with:
222222
node-version-file: .nvmrc
223223
cache: npm
@@ -255,7 +255,7 @@ jobs:
255255
name: build-output
256256

257257
- name: Restore Electron cache
258-
uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
258+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
259259
with:
260260
path: ~/.cache/electron
261261
key: electron-${{ runner.os }}-${{ hashFiles('.nvmrc', 'package.json') }}
@@ -264,7 +264,7 @@ jobs:
264264
run: node build/lib/preLaunch.ts
265265

266266
- name: Restore Playwright cache
267-
uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
267+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
268268
with:
269269
path: ~/.cache/ms-playwright
270270
key: playwright-${{ runner.os }}-${{ hashFiles('package.json') }}
@@ -394,12 +394,12 @@ jobs:
394394
timeout-minutes: 60
395395
steps:
396396
- name: Checkout
397-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
397+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
398398
with:
399399
ref: ${{ needs.setup.outputs.test_is_version != 'true' && inputs.test_build || github.ref }}
400400

401401
- name: Setup Node.js
402-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
402+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
403403
with:
404404
node-version-file: .nvmrc
405405
cache: npm
@@ -437,7 +437,7 @@ jobs:
437437
name: build-output
438438

439439
- name: Restore Electron cache
440-
uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
440+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
441441
with:
442442
path: ~/.cache/electron
443443
key: electron-${{ runner.os }}-${{ hashFiles('.nvmrc', 'package.json') }}
@@ -446,7 +446,7 @@ jobs:
446446
run: node build/lib/preLaunch.ts
447447

448448
- name: Restore Playwright cache
449-
uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
449+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
450450
with:
451451
path: ~/.cache/ms-playwright
452452
key: playwright-${{ runner.os }}-${{ hashFiles('package.json') }}
@@ -502,12 +502,12 @@ jobs:
502502
timeout-minutes: 30
503503
steps:
504504
- name: Checkout
505-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
505+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
506506
with:
507507
ref: ${{ needs.setup.outputs.test_is_version != 'true' && inputs.test_build || github.ref }}
508508

509509
- name: Setup Node.js
510-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
510+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
511511
with:
512512
node-version-file: .nvmrc
513513

‎.github/workflows/component-fixtures.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
29+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3030
with:
3131
# Need enough history for the merge-base lookup below to succeed even
3232
# when the target branch has advanced since the PR was opened. Full
3333
# clone would be wasteful for this large repo, so cap at 50.
3434
fetch-depth: 50
3535

3636
- name: Setup Node.js
37-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
37+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
3838
with:
3939
node-version-file: .nvmrc
4040

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
# If you do not check out your code, Copilot will do this for you.
2727
steps:
2828
- name: Checkout microsoft/vscode
29-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
29+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3030

3131
- name: Setup Node.js
32-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
32+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
3333
with:
3434
node-version-file: .nvmrc
3535

@@ -104,7 +104,7 @@ jobs:
104104

105105
- name: Restore built-in extensions cache
106106
id: cache-builtin-extensions
107-
uses: actions/cache/restore@caa296126883cff596d87d8935842f9db880ef25 # v5.1.0
107+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
108108
with:
109109
enableCrossOsArchive: true
110110
path: .build/builtInExtensions

‎.github/workflows/css-order-scan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
23+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2424
with:
2525
fetch-depth: 1
2626

2727
- name: Setup Node.js
28-
uses: actions/setup-node@249970729cb0ef3589644e2896645e5dc5ba9c38 # v6.5.0
28+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
2929
with:
3030
node-version-file: .nvmrc
3131

0 commit comments

Comments
 (0)