Merge branch 'main' of https://github.com/microsoft/vscode-copilot-chat into remove-experimentation-service

Author: luabud

.esbuild.ts

@@ -45,7 +45,7 @@ const baseNodeBuildOptions = {
 	mainFields: ["module", "main"], // needed for jsonc-parser,
 	define: {
 		'process.env.APPLICATIONINSIGHTS_CONFIGURATION_CONTENT': '"{}"'
-	}
+	},
 } satisfies esbuild.BuildOptions;
 
 const nodeExtHostTestGlobs = [
@@ -65,7 +65,7 @@ const testBundlePlugin: esbuild.Plugin = {
 			return { path: path.resolve(args.path) };
 		});
 		build.onLoad({ filter: /[\/\\]test-extension\.ts$/ }, async args => {
-			let files = await glob(nodeExtHostTestGlobs, { cwd: REPO_ROOT, posix: true });
+			let files = await glob(nodeExtHostTestGlobs, { cwd: REPO_ROOT, posix: true, ignore: ['src/extension/completions-core/**/*'] });
 			files = files.map(f => path.posix.relative('src', f));
 			if (files.length === 0) {
 				throw new Error('No extension tests found');
@@ -95,7 +95,7 @@ const sanityTestBundlePlugin: esbuild.Plugin = {
 			return { path: path.resolve(args.path) };
 		});
 		build.onLoad({ filter: /[\/\\]sanity-test-extension\.ts$/ }, async args => {
-			let files = await glob(nodeExtHostSanityTestGlobs, { cwd: REPO_ROOT, posix: true });
+			let files = await glob(nodeExtHostSanityTestGlobs, { cwd: REPO_ROOT, posix: true, ignore: ['src/extension/completions-core/**/*'] });
 			files = files.map(f => path.posix.relative('src', f));
 			if (files.length === 0) {
 				throw new Error('No extension tests found');
@@ -111,6 +111,23 @@ const sanityTestBundlePlugin: esbuild.Plugin = {
 	}
 };
 
+const importMetaPlugin: esbuild.Plugin = {
+	name: 'claudeCodeImportMetaPlugin',
+	setup(build) {
+		// Handle import.meta.url in @anthropic-ai/claude-code package
+		build.onLoad({ filter: /node_modules[\/\\]@anthropic-ai[\/\\]claude-code[\/\\].*\.mjs$/ }, async (args) => {
+			const contents = await fs.promises.readFile(args.path, 'utf8');
+			return {
+				contents: contents.replace(
+					/import\.meta\.url/g,
+					'require("url").pathToFileURL(__filename).href'
+				),
+				loader: 'js'
+			};
+		});
+	}
+};
+
 const shimVsCodeTypesPlugin: esbuild.Plugin = {
 	name: 'shimVsCodeTypesPlugin',
 	setup(build) {
@@ -157,7 +174,7 @@ const nodeExtHostBuildOptions = {
 		{ in: './src/sanity-test-extension.ts', out: 'sanity-test-extension' },
 	],
 	loader: { '.ps1': 'text' },
-	plugins: [testBundlePlugin, sanityTestBundlePlugin],
+	plugins: [testBundlePlugin, sanityTestBundlePlugin, importMetaPlugin],
 	external: [
 		...baseNodeBuildOptions.external,
 		'vscode'
@@ -173,6 +190,7 @@ const webExtHostBuildOptions = {
 	format: 'cjs', // Necessary to export activate function from bundle for extension
 	external: [
 		'vscode',
+		'http',
 	]
 } satisfies esbuild.BuildOptions;
 
@@ -217,7 +235,7 @@ const nodeSimulationWorkbenchUIBuildOptions = {
 		'child_process',
 		'http',
 		'assert',
-	]
+	],
 } satisfies esbuild.BuildOptions;
 
 async function typeScriptServerPluginPackageJsonInstall(): Promise<void> {
@@ -322,6 +340,7 @@ async function main() {
 				`**/*.w.json`,
 				'**/*.sqlite',
 				'**/*.sqlite-journal',
+				'test/aml/out/**'
 			]
 		});
 		rebuild();

.eslint-ignore

@@ -10,6 +10,9 @@ test/simulation/fixtures/**
 test/scenarios/**
 .simulation/**
 .eslintplugin/**
+chat-lib/**
+test/aml/out/**
+.vscode-test/**
 
 # ignore vs
 src/util/vs/**
@@ -26,3 +29,6 @@ src/extension/typescriptContext/serverPlugin/dist/**
 
 # Ignore Built test-extension
 .vscode/extensions/test-extension/dist/**
+
+# Ignore completions-core
+src/extension/completions-core/**

.eslintplugin/no-restricted-copilot-pr-string.ts

@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+export = new class NoBadGDPRComment implements eslint.Rule.RuleModule {
+	readonly meta: eslint.Rule.RuleMetaData = {
+		type: 'problem',
+		docs: {
+			description: 'Ensure "Generate with Copilot" string in GitHubPullRequestProviders is never changed',
+			category: 'Best Practices'
+		},
+		schema: [
+			{
+				type: 'object',
+				properties: {
+					className: { type: 'string' },
+					string: { type: 'string' }
+				},
+				additionalProperties: false
+			}
+		]
+	}
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		const options = context.options[0] || {};
+		const className = options.className || 'GitHubPullRequestProviders';
+		const requiredString = options.string || 'Copilot';
+
+		let inTargetClass = false;
+
+		return {
+			ClassDeclaration(node) {
+				if (node.id && node.id.name === className) {
+					inTargetClass = true;
+				}
+			},
+			'ClassDeclaration:exit'(node) {
+				if (node.id && node.id.name === className) {
+					inTargetClass = false;
+				}
+			},
+			Literal(node) {
+				if (inTargetClass && typeof node.value === 'string' && node.value.includes('Generate')) {
+					if (!node.value.includes(requiredString)) {
+						context.report({
+							node,
+							message: `String literal in ${className} must include the word "Copilot" as the string is referenced in the GitHub Pull Request extension. Talk to alexr00 if you need to change it.`
+						});
+					}
+				}
+			}
+		};
+	}
+};

.github/copilot-instructions.md

@@ -23,6 +23,19 @@ This is the **GitHub Copilot Chat** extension for Visual Studio Code - a VS Code
 - **Vitest**: Unit testing framework
 - **Python**: For notebooks integration and ML evaluation scripts
 
+## Validating changes
+
+You MUST check compilation output before running ANY script or declaring work complete!
+
+1. **ALWAYS** check the `start-watch-tasks` watch task output for compilation errors
+2. **NEVER** use the `compile` task as a way to check if everything is working properly
+3. **FIX** all compilation errors before moving forward
+
+### TypeScript compilation steps
+- Monitor the `start-watch-tasks` task outputs for real-time compilation errors as you make changes
+- This task runs `npm: watch:tsc-extension`,`npm: watch:tsc-extension-web`, `npm: watch:tsc-simulation-workbench`, and `npm: watch:esbuild` to incrementally compile the project
+- Start the task if it's not already running in the background
+
 ## Project Architecture
 
 ### Top-Level Directory Structure
@@ -225,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
 
@@ -241,6 +255,8 @@ 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.
 
 ## Key APIs and Integrations
 
@@ -319,3 +335,7 @@ The extension uses numerous proposed VS Code APIs for advanced functionality:
 - **Configuration**: Modify `package.json` contributions for VS Code integration
 
 This extension is a complex, multi-layered system that provides comprehensive AI assistance within VS Code. Understanding the service architecture, contribution system, and separation between platform and extension layers is crucial for making effective changes.
+
+## Best Practices
+- Use services and dependency injection whenever possible instead of using node or vscode APIs directly. For example, use `IFileService` instead of node's `fs`.
+- Always use the URI type instead of using string file paths. There are many helpers available for working with URIs.

.github/instructions/prompt-tsx.instructions.md

@@ -0,0 +1,167 @@
+---
+applyTo: '**/*.tsx'
+description: Prompt-TSX coding guidelines
+---
+
+Guidelines for TSX files using [prompt-tsx](https://github.com/microsoft/vscode-prompt-tsx) focusing on specific patterns and token budget management for AI prompt engineering.
+
+## Component Structure
+
+### Base Pattern
+- Extend `PromptElement<Props>` or `PromptElement<Props, State>` for all prompt components
+- Props interfaces must extend `BasePromptElementProps`
+
+```tsx
+interface MyPromptProps extends BasePromptElementProps {
+	readonly userQuery: string;
+}
+
+class MyPrompt extends PromptElement<MyPromptProps> {
+	render() {
+		return (
+			<>
+				<SystemMessage priority={1000}>...</SystemMessage>
+				<UserMessage priority={900}>{this.props.userQuery}</UserMessage>
+			</>
+		);
+	}
+}
+```
+
+### Async Components
+- The `render` method can be async for components that need to perform async operations
+- All async work should be done directly in the `render` method
+
+```tsx
+class FileContextPrompt extends PromptElement<FileContextProps> {
+	async render() {
+		const fileContent = await readFileAsync(this.props.filePath);
+		return (
+			<>
+				<SystemMessage priority={1000}>File content:</SystemMessage>
+				<UserMessage priority={900}>{fileContent}</UserMessage>
+			</>
+		);
+	}
+}
+```
+
+## Prompt-Specific JSX
+
+### Line Breaks
+- **CRITICAL**: Use `<br />` for line breaks - newlines are NOT preserved in JSX
+- Never rely on whitespace or string literal newlines
+
+```tsx
+// ✅ Correct
+<SystemMessage>
+	You are an AI assistant.<br />
+	Follow these guidelines.<br />
+</SystemMessage>
+
+// ❌ Wrong - newlines will be collapsed
+<SystemMessage>
+	You are an AI assistant.
+	Follow these guidelines.
+</SystemMessage>
+```
+
+## Priority System
+
+### Priority Values
+- Higher numbers = higher priority (like z-index)
+- Use consistent ranges:
+  - System messages: 1000
+  - User queries: 900
+  - Recent history: 700-800
+  - Context/attachments: 600-700
+  - Background info: 0-500
+
+```tsx
+<SystemMessage priority={1000}>...</SystemMessage>
+<UserMessage priority={900}>{query}</UserMessage>
+<HistoryMessages priority={700} />
+<ContextualData priority={500} />
+```
+
+### Flex Properties for Token Budget
+- `flexGrow={1}` - expand to fill remaining token space
+- `flexReserve` - reserve tokens before rendering
+- `passPriority` - pass-through containers that don't affect child priorities
+
+```tsx
+<FileContext priority={70} flexGrow={1} files={this.props.files} />
+<History passPriority older={0} newer={80} flexGrow={2} flexReserve="/5" />
+```
+
+## Content Handling
+
+### TextChunk for Truncation
+- Use `TextChunk` for content that may exceed token budget
+- Set `breakOn` patterns for intelligent truncation
+
+```tsx
+<TextChunk breakOnWhitespace priority={100}>
+	{longUserQuery}
+</TextChunk>
+
+<TextChunk breakOn=" " priority={80}>
+	{documentContent}
+</TextChunk>
+```
+
+### Tag Component for Structured Content
+- Use `Tag` for XML-like structured content with attributes
+- Validates tag names and properly formats attributes
+
+```tsx
+<Tag name="attachments" attrs={{ id: variableName, type: "file" }}>
+	{content}
+</Tag>
+```
+
+## References and Metadata
+
+### Prompt References
+- Use `<references>` for tracking variable usage
+- Use `<meta>` for metadata that survives pruning
+
+```tsx
+<references value={[new PromptReference({ variableName })]} />
+<meta value={new ToolResultMetadata(id, result)} />
+```
+
+### Keep-With Pattern
+- Use `useKeepWith()` for content that should be pruned together
+
+```tsx
+const KeepWith = useKeepWith();
+return (
+	<>
+		<KeepWith priority={2}>
+			<ToolCallRequest>...</ToolCallRequest>
+		</KeepWith>
+		<KeepWith priority={1}>
+			<ToolCallResponse>...</ToolCallResponse>
+		</KeepWith>
+	</>
+);
+```
+
+## Token Budget Management
+
+### Sizing-Aware Rendering
+- Use `PromptSizing` parameter for budget-aware content generation
+- Implement cooperative token usage
+
+```tsx
+async render(sizing: PromptSizing): Promise<PromptPiece> {
+	const content = await this.generateContent(sizing.tokenBudget);
+	return <>{content}</>;
+}
+```
+
+### Performance
+- Avoid expensive work in `render` methods when possible
+- Cache computations when appropriate
+- Use async `render` for all async operations