Merge branch 'main' into dev/mjbvz/asleep-guppy

Author: mjbvz

.esbuild.ts

@@ -122,10 +122,10 @@ const sanityTestBundlePlugin: esbuild.Plugin = {
 };
 
 const importMetaPlugin: esbuild.Plugin = {
-	name: 'claudeCodeImportMetaPlugin',
+	name: 'claudeAgentSdkImportMetaPlugin',
 	setup(build) {
-		// Handle import.meta.url in @anthropic-ai/claude-code package
-		build.onLoad({ filter: /node_modules[\/\\]@anthropic-ai[\/\\]claude-code[\/\\].*\.mjs$/ }, async (args) => {
+		// Handle import.meta.url in @anthropic-ai/claude-agent-sdk package
+		build.onLoad({ filter: /node_modules[\/\\]@anthropic-ai[\/\\]claude-agent-sdk[\/\\].*\.mjs$/ }, async (args) => {
 			const contents = await fs.promises.readFile(args.path, 'utf8');
 			return {
 				contents: contents.replace(

.eslintplugin/no-nls-localize.ts

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+import { createImportRuleListener } from './utils';
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noNlsLocalize: 'Do not import localize from nls. Use vscode.l10n.t or import l10n from @vscode/l10n instead.'
+		},
+		docs: {
+			description: 'Disallow importing localize from nls files',
+		},
+		schema: []
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return createImportRuleListener((node, path) => {
+			// Match paths ending with /nls, /nls.js, /vs/nls, etc.
+			if (path.endsWith('/nls') || path.endsWith('/nls.js') || path === 'vs/nls') {
+				context.report({
+					loc: node.parent!.loc,
+					messageId: 'noNlsLocalize'
+				});
+			}
+		});
+	}
+};

.vscode/settings.json

@@ -51,6 +51,7 @@
 	"search.exclude": {
 		"src/base/util/tokenizer_*.json": true,
 		"src/base/util/*.bpe": true,
+		"src/extension/chatSessions/vscode-node/test/fixtures/**": true,
 		"src/extension/prompts/node/test/fixtures/**/*": true,
 		"src/extension/test/node/fixtures/**/*": true,
 		"src/platform/parser/test/node/fixtures/**/*": true,

chat-lib/test/getInlineCompletions.spec.ts

@@ -209,7 +209,7 @@ class NullLogTarget implements ILogTarget {
 describe('getInlineCompletions', () => {
 	it('should return completions for a document and position', async () => {
 		const provider = createInlineCompletionsProvider({
-			fetcher: new TestFetcher({ '/v1/engines/gpt-4o-copilot/completions': await readFile(join(__dirname, 'getInlineCompletions.reply.txt'), 'utf8') }),
+			fetcher: new TestFetcher({ '/v1/engines/gpt-41-copilot/completions': await readFile(join(__dirname, 'getInlineCompletions.reply.txt'), 'utf8') }),
 			authService: new TestAuthService(),
 			telemetrySender: new TestTelemetrySender(),
 			logTarget: new NullLogTarget(),

chat-lib/test/nesProvider.spec.ts

@@ -141,7 +141,10 @@ describe('NESProvider Facade', () => {
 		doc.setSelection([new OffsetRange(1, 1)], undefined);
 		const telemetrySender = new TestTelemetrySender();
 		const logTarget = new TestLogTarget();
-		const fetcher = new TestFetcher({ '/chat/completions': await fs.readFile(path.join(__dirname, 'nesProvider.reply.txt'), 'utf8') });
+		const fetcher = new TestFetcher({
+			'/models': JSON.stringify({ models: [] }),
+			'/chat/completions': await fs.readFile(path.join(__dirname, 'nesProvider.reply.txt'), 'utf8'),
+		});
 		const nextEditProvider = createNESProvider({
 			workspace,
 			fetcher,
@@ -157,8 +160,10 @@ describe('NESProvider Facade', () => {
 
 		const result = await nextEditProvider.getNextEdit(doc.id.toUri(), CancellationToken.None);
 
-		assert.strictEqual(fetcher.requests.length, 1);
-		assert.strictEqual(fetcher.requests[0].options.json?.model, 'xtab-test');
+		assert.strictEqual(fetcher.requests.length, 2, `Unexpected requests: ${JSON.stringify(fetcher.requests, null, 2)}`);
+		assert.ok(fetcher.requests[0].url.endsWith('/models'), `Unexpected URL: ${fetcher.requests[0].url}`);
+		assert.ok(fetcher.requests[1].url.endsWith('/chat/completions'), `Unexpected URL: ${fetcher.requests[1].url}`);
+		assert.strictEqual(fetcher.requests[1].options.json?.model, 'xtab-test');
 
 		assert(result.result);
 
@@ -191,6 +196,7 @@ describe('NESProvider Facade', () => {
 		nextEditProvider.dispose();
 
 		expect(logTarget.logs.length).toBeGreaterThan(0);
-		expect(logTarget.logs.filter(l => l.level === LogLevel.Error)).toHaveLength(0);
+		const errorLogs = logTarget.logs.filter(l => l.level === LogLevel.Error);
+		assert.strictEqual(errorLogs.length, 0, `Unexpected error logs: ${JSON.stringify(errorLogs, null, 2)}`);
 	});
 });

chat-lib/test/simpleExperimentationService.spec.ts

@@ -5,10 +5,11 @@
 
 import { describe, expect, it } from 'vitest';
 import { SimpleExperimentationService } from '../src/main';
+import { DefaultsOnlyConfigurationService } from '../src/_internal/platform/configuration/common/defaultsOnlyConfigurationService';
 
 describe('SimpleExperimentationService', () => {
 	it('should initialize with no treatment variables', async () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 		await service.hasTreatments();
 
 		expect(service.getTreatmentVariable('nonexistent')).toBeUndefined();
@@ -17,7 +18,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should update multiple treatment variables at once', () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 		const variables: Record<string, boolean | number | string> = {
 			'feature-a': true,
 			'feature-b': false,
@@ -36,7 +37,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should fire onDidTreatmentsChange event with all changed variables', () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 		const events: string[][] = [];
 
 		service.onDidTreatmentsChange((event) => {
@@ -60,7 +61,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should not fire onDidTreatmentsChange event when no variables change', () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 		const events: string[][] = [];
 
 		// Set initial value
@@ -85,7 +86,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should fire onDidTreatmentsChange event only for changed variables', () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 
 		// Set initial values
 		const variables1: Record<string, boolean | number | string> = {
@@ -113,7 +114,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should overwrite existing treatment variables', () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 
 		const variables1: Record<string, boolean | number | string> = {
 			'feature-flag': true
@@ -133,7 +134,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should wait for treatment variables when waitForTreatmentVariables = true', async () => {
-		const service = new SimpleExperimentationService(true);
+		const service = new SimpleExperimentationService(true, new DefaultsOnlyConfigurationService());
 
 		// hasTreatments() should not resolve until updateTreatmentVariables() is called
 		let hasTreatmentsResolved = false;
@@ -160,7 +161,7 @@ describe('SimpleExperimentationService', () => {
 	});
 
 	it('should remove treatment variable when omitted from update', () => {
-		const service = new SimpleExperimentationService(false);
+		const service = new SimpleExperimentationService(false, new DefaultsOnlyConfigurationService());
 
 		// Set initial variables
 		const variables1: Record<string, boolean | number | string> = {

eslint.config.mjs

@@ -277,6 +277,7 @@ export default tseslint.config(
 					string: 'Generate with Copilot'
 				}
 			],
+			'local/no-nls-localize': ['error'],
 		}
 	},
 	{