Merge remote-tracking branch 'upstream/main' into merge/1.104.0

Author: timtmok

.esbuild.ts

@@ -42,6 +42,8 @@ const baseNodeBuildOptions = {
 		// --- Start Positron ---
 		'@vscode/prompt-tsx',
 		// --- End Positron ---
+		'node-pty', // Required by @github/copilot
+		'@github/copilot',
 		...(isDev ? [] : ['dotenv', 'source-map-support'])
 	],
 	platform: 'node',

.eslint-ignore

@@ -11,6 +11,8 @@ test/scenarios/**
 .simulation/**
 .eslintplugin/**
 chat-lib/**
+test/aml/out/**
+.vscode-test/**
 
 # ignore vs
 src/util/vs/**

.github/copilot-instructions.md

@@ -238,6 +238,7 @@ x => x + x                    // ✓ Correct
 ### Code Structure
 - Always surround loop and conditional bodies with curly braces
 - Open curly braces always go on the same line as whatever necessitates them
+   - An open curly brace MUST be followed by a newline, with the body indented on the next line
 - Parenthesized constructs should have no surrounding whitespace
 - Single space follows commas, colons, and semicolons
 
@@ -254,6 +255,10 @@ function f(x: number, y: string): void { }
 ### Type Management
 - Do not export `types` or `functions` unless you need to share it across multiple components
 - Do not introduce new `types` or `values` to the global namespace
+- Use proper types. Do not use `any` unless absolutely necessary.
+- Use `readonly` whenever possible.
+- Avoid casts in TypeScript unless absolutely necessary. If you get type errors after your changes, look up the types of the variables involved and set up a proper system of types and interfaces instead of adding type casts.
+- Do not use `any` or `unknown` as the type for variables, parameters, or return values unless absolutely necessary. If they need type annotations, they should have proper types or interfaces defined.
 
 ## Key APIs and Integrations
 

.github/instructions/vitest-unit-tests.instructions.md

@@ -3,12 +3,34 @@ applyTo: '**/*.spec.ts'
 description: Vitest unit testing guidelines
 ---
 
-Guidelines for writing unit tests using Vitest. These tests are `*.spec.ts`
+Please follow these guidelines when writing unit tests using Vitest. These tests are `*.spec.ts`
 
 ## Best Practices
 
-- Use proper mocks when possible rather than ad-hoc objects injected as dependencies. For example, call `createExtensionUnitTestingServices` to get some mock services, and `IInstantiationService` to create instances with those mocks.
-- If there is no preexisting implementation of a service that is appropriate to reuse in the test, then you can create a simple mock or stub implementation.
-- Avoid casting to `any` whenever possible.
-- When asked to write new tests, add tests for things that are interesting and nontrivial. Don't add a test that just verifies that a setter/getter work.
-- Prefer the runTests tool to run tests over a terminal command.
+- Prefer explicit Test/Mock classes over mutating real instances or creating adhoc one-off mocks.
+    - Never use `as any` to override private methods or assign properties on real objects.
+    - Mock versions of services are typically named `Mock*` or `Test*`, you can search to find whether one already exists.
+    - Some examples: `MockFileSystemService`, `MockChatResponseStream`, `TestTasksService`.
+
+- If there is no preexisting implementation of a service that is appropriate to reuse in the test, then you can create a simple mock or stub implementation in a file under a `test/` folder near the interface definition.
+    - A mock class should be configurable so that it can be shared and set up for different test scenarios.
+
+- The helper `createExtensionUnitTestingServices` returns a `TestingServiceCollection` preconfigured with some common mock services, use `IInstantiationService` to create instances with those mocks. Here's an example of using it properly
+
+```ts
+const serviceCollection = store.add(createExtensionUnitTestingServices());
+instantiationService = serviceCollection.createTestingAccessor().get(IInstantiationService);
+const mockFs = accessor.get(IFileSystemService) as MockFileSystemService;
+const testService = instantiationService.createInstance(SomeServiceToTest);
+```
+
+- When asked to write new tests, add tests to cover the behavior of the code under test, especially things that are interesting, unexpected, or edge cases.
+    - Avoid adding tests that simply repeat existing tests or cover trivial code paths.
+
+- If available, prefer the runTests tool to run tests over a terminal command.
+
+- Keep tests deterministic and fast.
+    - Avoid starting real servers or performing network I/O.
+
+- Avoid excessive repetition in tests, use `beforeEach` to set up common state.
+    - Use helper functions to encapsulate common test logic.

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

@@ -0,0 +1,72 @@
+name: Copilot Setup Steps
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  copilot-setup-steps:
+    name: Setup Development Environment
+    runs-on: vscode-large-runners
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          lfs: true
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22.14.x'
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          architecture: 'x64'
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.0'
+
+      - name: Install setuptools
+        run: pip install setuptools
+
+      - name: Restore build cache
+        uses: actions/cache/restore@v4
+        id: build-cache
+        with:
+          key: build_cache-${{ hashFiles('build/.cachesalt', 'package-lock.json') }}
+          path: .build/build_cache
+
+      - name: Extract build cache
+        if: steps.build-cache.outputs.cache-hit == 'true'
+        run: tar -xzf .build/build_cache/cache.tgz
+
+      - name: Install dependencies
+        if: steps.build-cache.outputs.cache-hit != 'true'
+        run: npm ci
+
+      - name: Create build cache archive
+        if: steps.build-cache.outputs.cache-hit != 'true'
+        run: |
+          set -e
+          mkdir -p .build
+          node build/listBuildCacheFiles.js .build/build_cache_list.txt
+          mkdir -p .build/build_cache
+          tar -czf .build/build_cache/cache.tgz --files-from .build/build_cache_list.txt
+
+      - name: Verify installation
+        run: |
+          node --version
+          npm --version
+          python --version
+          dotnet --version

.vscode/launch.json

@@ -297,7 +297,49 @@
 			"presentation": {
 				"group": "2_launch"
 			}
-		}
+		},
+		{
+			"name": "Attach to Extension Host - Code OSS",
+			"type": "node",
+			"request": "attach",
+			"restart": true,
+			"timeout": 0,
+			"port": 5870,
+			"sourceMaps": true,
+			"outFiles": [
+				"${workspaceFolder}/../vscode/out/**/*.js",
+				"${workspaceFolder}/../vscode/extensions/*/out/**/*.js",
+				"${workspaceFolder}/dist/**/*.js",
+				"!**/node_modules/**"
+			],
+			"presentation": {
+				"group": "2_launch"
+			}
+		},
+		{
+			"name": "Run Completions-Core Extension Tests",
+			"type": "extensionHost",
+			"request": "launch",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--extensionTestsPath=${workspaceFolder}/src/extension/completions-core/extension/test/run",
+				"--disable-extensions"
+			],
+			"env": {
+				"TSX_TSCONFIG_PATH": "${workspaceFolder}/tsconfig.json",
+				"VITEST": "true"
+			},
+			"internalConsoleOptions": "openOnSessionStart",
+			"outFiles": [
+				"${workspaceFolder}/**/*.ts",
+				"${workspaceFolder}/dist/**/*.js",
+				"!**/node_modules/**"
+			],
+			"autoAttachChildProcesses": true,
+			"presentation": {
+				"group": "1_launch"
+			}
+		},
 	],
 	"compounds": [
 		{
@@ -312,4 +354,4 @@
 			}
 		}
 	]
-}
+}

.vscodeignore

@@ -18,6 +18,9 @@ assets/walkthroughs/**
 !dist/cli.js
 !node_modules/@vscode/copilot-typescript-server-plugin/package.json
 !node_modules/@vscode/copilot-typescript-server-plugin/dist/*.js
+!node_modules/@github/copilot/**/package.json
+!node_modules/@github/copilot/**/*.js
+!node_modules/@github/copilot/**/*.wasm
 !CHANGELOG.md
 !README.md
 !package.json