Merge tag 'v0.35.2025121002' into merge/1.107.0

Author: timtmok

.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'
+				});
+			}
+		});
+	}
+};

.github/CODENOTIFY

@@ -0,0 +1,6 @@
+# Model prompts
+src/extension/prompts/node/agent/openAIPrompts.tsx @dileepyavan @kcutler
+src/extension/prompts/node/agent/anthropicPrompts.tsx @bhavyaus @bryanchen-d
+src/extension/prompts/node/agent/geminiPrompts.tsx @vijayupadya @pwang347
+src/extension/prompts/node/agent/xAIPrompts.tsx @pwang347 @vijayupadya
+src/extension/prompts/node/agent/vscModelPrompts.tsx @karthiknadig @eleanorjboyd

.github/CODEOWNERS

@@ -3,10 +3,3 @@
 build/pr-check-cache-files.ts @lszomoru @joaomoreno
 test/base/cache-cli.ts @lszomoru @joaomoreno
 test/base/cache.ts @lszomoru @joaomoreno
-# Model prompts
-src/extension/prompts/node/agent/openAIPrompts.tsx @roblourens
-src/extension/prompts/node/agent/anthropicPrompts.tsx @bhavyaus
-src/extension/prompts/node/agent/geminiPrompts.tsx @vijayupadya
-src/extension/prompts/node/agent/xAIPrompts.tsx @pwang347
-src/extension/prompts/node/agent/vscModelPrompts.tsx @karthiknadig
-src/extension/prompts/node/agent/promptRegistry.ts @bhavyaus

.github/copilot-instructions.md

@@ -339,5 +339,5 @@ The extension uses numerous proposed VS Code APIs for advanced functionality:
 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`.
+- Use services and dependency injection whenever possible instead of using node or vscode APIs directly. For example, use `IFileSystemService` 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/workflows/copilot-setup-steps.yml

@@ -17,23 +17,23 @@ jobs:
     runs-on: vscode-large-runners
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
           architecture: 'x64'
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0'
 

.github/workflows/ensure-node-modules-cache.yml

@@ -14,12 +14,12 @@ jobs:
     runs-on: [ self-hosted, 1ES.Pool=1es-vscode-ubuntu-22.04-x64 ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
@@ -48,17 +48,17 @@ jobs:
     runs-on: [ self-hosted, 1ES.Pool=1es-vscode-windows-2022-x64 ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
           architecture: 'x64'

.github/workflows/pr.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - 'release/*'
+      - '0.34/sessions'
 
 permissions:
   contents: read
@@ -19,11 +20,11 @@ jobs:
     runs-on: [ self-hosted, 1ES.Pool=1es-vscode-ubuntu-22.04-x64 ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
@@ -58,11 +59,11 @@ jobs:
     runs-on: [ self-hosted, 1ES.Pool=1es-vscode-ubuntu-22.04-x64 ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
@@ -74,23 +75,23 @@ jobs:
     runs-on: [ self-hosted, 1ES.Pool=1es-vscode-ubuntu-22.04-x64 ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
           architecture: 'x64'
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0'
 
@@ -154,7 +155,7 @@ jobs:
 
       - name: Upload simulation output
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: simulation-output-linux-${{ github.run_attempt }}
           path: .simulation-archive/simulation.tgz
@@ -164,23 +165,23 @@ jobs:
     runs-on: [ self-hosted, 1ES.Pool=1es-vscode-windows-2022-x64 ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           lfs: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '22.14.x'
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.12'
           architecture: 'x64'
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '10.0'
 

.nvmrc

@@ -1 +1 @@
-22.15.1
+22.20.0

.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,