[pull] main from microsoft:main

build/buildfile.ts

@@ -33,6 +33,8 @@ export const workbenchDesktop = [
 
 export const workbenchWeb = createModuleDescription('vs/workbench/workbench.web.main.internal');
 
+export const sessionsWeb = createModuleDescription('vs/sessions/sessions.web.main.internal');
+
 export const keyboardMaps = [
 	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux'),
 	createModuleDescription('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin'),
@@ -73,6 +75,7 @@ const buildfile = {
 	workerBackgroundTokenization,
 	workbenchDesktop,
 	workbenchWeb,
+	sessionsWeb,
 	keyboardMaps,
 	code,
 	codeWeb,

build/gulpfile.vscode.ts

@@ -372,6 +372,10 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 
 		const name = product.nameShort;
 		const packageJsonUpdates: Record<string, unknown> = { name, version };
+		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
+		const embedded = isInsiderOrExploration
+			? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
+			: undefined;
 
 		if (platform === 'linux') {
 			packageJsonUpdates.desktopName = `${product.applicationName}.desktop`;
@@ -387,18 +391,23 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 
 		let productJsonContents: string;
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(jsonEditor({ commit, date: readISODate(out), checksums, version }))
+			.pipe(jsonEditor((json: Record<string, unknown>) => {
+				json.commit = commit;
+				json.date = readISODate(out);
+				json.checksums = checksums;
+				json.version = version;
+				if (embedded) {
+					json['darwinSiblingBundleIdentifier'] = embedded.darwinBundleIdentifier;
+					const embeddedObj = json['embedded'] as EmbeddedProductInfo;
+					embeddedObj['darwinSiblingBundleIdentifier'] = json['darwinBundleIdentifier'] as string;
+				}
+				return json;
+			}))
 			.pipe(es.through(function (file) {
 				productJsonContents = file.contents.toString();
 				this.emit('data', file);
 			}));
 
-
-		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
-		const embedded = isInsiderOrExploration
-			? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
-			: undefined;
-
 		const packageSubJsonStream = embedded
 			? gulp.src(['package.json'], { base: '.' })
 				.pipe(jsonEditor((json: Record<string, unknown>) => {

build/gulpfile.vscode.web.ts

@@ -116,6 +116,7 @@ const vscodeWebEntryPoints = [
 	buildfile.workerBackgroundTokenization,
 	buildfile.keyboardMaps,
 	buildfile.workbenchWeb,
+	buildfile.sessionsWeb,
 ].flat();
 
 /**

build/lib/embeddedType.ts

@@ -9,6 +9,7 @@ export type EmbeddedProductInfo = {
 	applicationName: string;
 	dataFolderName: string;
 	darwinBundleIdentifier: string;
+	darwinSiblingBundleIdentifier?: string;
 	urlProtocol: string;
 	win32AppUserModelId: string;
 	win32MutexName: string;

build/lib/mangle/index.ts

@@ -321,6 +321,7 @@ const skippedExportMangledFiles = [
 		buildfile.workerBackgroundTokenization,
 		buildfile.workbenchDesktop,
 		buildfile.workbenchWeb,
+		buildfile.sessionsWeb,
 		buildfile.code,
 		buildfile.codeWeb
 	].flat().map(x => x.name),

build/next/index.ts

@@ -119,6 +119,11 @@ const webEntryPoints = [
 	'vs/code/browser/workbench/workbench',
 ];
 
+// Additional web-only entry points (CDN build only, not in server-web)
+const webOnlyEntryPoints = [
+	'vs/sessions/sessions.web.main.internal',
+];
+
 const keyboardMapEntryPoints = [
 	'vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux',
 	'vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin',
@@ -173,6 +178,7 @@ function getEntryPointsForTarget(target: BuildTarget): string[] {
 		case 'web':
 			return [
 				...workerEntryPoints,
+				...webOnlyEntryPoints,
 				'vs/workbench/workbench.web.main.internal', // web workbench only (no browser shell)
 				...keyboardMapEntryPoints,
 			];
@@ -220,6 +226,7 @@ function getCssBundleEntryPointsForTarget(target: BuildTarget): Set<string> {
 		case 'web':
 			return new Set([
 				'vs/workbench/workbench.web.main.internal',
+				'vs/sessions/sessions.web.main.internal',
 			]);
 		default:
 			throw new Error(`Unknown target: ${target}`);

extensions/copilot/.github/prompts/updateGithubCopilotSDK.prompt.md → extensions/copilot/.agents/skills/github-copilot-upgrader/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: updateGithubCopilotSDK
+name: github-copilot-upgrader
 description: Use this to update the Github Copilot CLI/SDK
 model: Claude Opus 4.6
 ---
@@ -10,7 +10,6 @@ You are an expert at upgrading the @github/copilot npm package in the vscode-cop
 
 You must create a TODO list of all items that are to be completed.
 You MUST create a TODO markdown file before commencing any of the work. Update this file after each step is completed.
-You must also use the update_todo tool on each step.
 Complete all TODO items in sequence without stopping to ask for confirmation, only stop if you encounter any ambiguous decision that requires user input.
 The TODO is your primary tracking mechanism. Before each step you MUST read the TODO to determine what to do next.
 
@@ -23,9 +22,12 @@ At a minimum your TODO must contain the following:
 6. test
 7. Repease steps Compile, fix and tests until all tests are passing
 8. Run integration tests
-9. Repeate Compile, Fix, Test, Test integration tests until all integration tests are passing
+9. Repeate Compile, Fix, Test, until all tests are passing
 11. Create a summary
 
+Note:
+* Do not run any integration test.
+
 Follow these steps exactly:
 
 ### 1. Snapshot of old type definitions
@@ -48,6 +50,7 @@ After this you MSUT run `npm run postinstall`
 - You must perform a deep analysis of the compilation errors before attempting to resolve them.
 - Ensure there are no compilation errors before proceeding to run the tests.
 ```bash
+npm run postinstall
 npm run compile
 npx tsc --noEmit --project tsconfig.json
 ```
@@ -61,36 +64,6 @@ npm run test:unit
 If the upgrade causes a test to fail, you must analyze the failure and determine if it is due to a legitimate issue caused by the upgrade or if it is a problem with the test itself.
 - Ensure all tests are passing before proceeding to the next step.
 
-### 5. Running integration tests
-
-- The tests are located in test/e2e/cli.stest.ts.
-- The tests in this file are all skipped by default using `suite.skip`, so you must remove the `.skip` to enable them before running the tests.
-- Run the tests using the following command:
-```bash
-npm run simulate -- --grep=@cli --verbose -n=1 -p=1@cli
-```
-
-These tests are very slow, you might have to wait for around 5 minutes for them to complete.
-- As earlier, fix the test failures without changing the behavior of the code, and ensure that all tests are passing.
-
-NOTE:
-Tests are considered passing only if you get a score of 100%
-Here's a sample output. As you can see below the score needs to be 100/100 for the tests to be considered passing.
-```
-Suite Summary by Language:
-┌─────────┬───────────────────┬──────────┬───────┬────────────┬──────────┐
-│ (index) │ Suite             │ Language │ Model │ # of tests │ Score(%) │
-├─────────┼───────────────────┼──────────┼───────┼────────────┼──────────┤
-│ 0       │ '@cli [external]' │ '-'      │ '-'   │ 16         │ 100      │
-└─────────┴───────────────────┴──────────┴───────┴────────────┴──────────┘
-
-Approximate Summary (due to using --n=1 instead of --n=10):
-Overall Approximate Score: 100.00 / 100
-
-```
-
-#### 6. Re-introduce `stest.skip` changes in cli.stest.ts
-
 #### 5. Summarize the changes
 
 - After successfully upgrading the @github/copilot package and ensuring that all tests are passing, you must create a summary of the changes that were made during the upgrade process.

extensions/copilot/build/npm-package-next.yml

@@ -0,0 +1,113 @@
+trigger: none
+
+pr: none
+
+resources:
+  repositories:
+    - repository: templates
+      type: github
+      name: microsoft/vscode-engineering
+      ref: main
+      endpoint: Monaco
+  pipelines:
+    - pipeline: vscode
+      source: '⭐️ VS Code'
+      trigger:
+        stages:
+          - Release
+        branches:
+          include:
+            - main
+            - release/*
+
+parameters:
+  - name: NPM_REGISTRY
+    displayName: "Custom NPM Registry"
+    type: string
+    default: 'https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/'
+
+name: "$(Date:yyyyMMdd).$(Rev:r)"
+
+extends:
+  template: azure-pipelines/npm-package/pipeline.yml@templates
+  parameters:
+    npmPackages:
+      - name: vscode-copilot-chat
+        buildSteps:
+          - task: NodeTool@0
+            inputs:
+              versionSpec: 22.x
+            displayName: 🛠 Install Node.js (22.x)
+
+          - template: extensions/copilot/build/steps/setup-npm.yml@self
+            parameters:
+              NPM_REGISTRY: ${{ parameters.NPM_REGISTRY }}
+
+          - download: vscode
+            artifact: copilot_vsix
+            displayName: 📥 Download Copilot VSIX
+            condition: and(succeeded(), ne(variables['resources.pipeline.vscode.runName'], ''))
+
+          - bash: |
+              set -e
+              if [ -f "$(Pipeline.Workspace)/vscode/copilot_vsix/copilot-chat.vsix" ]; then
+                unzip -o "$(Pipeline.Workspace)/vscode/copilot_vsix/copilot-chat.vsix" 'extension/package.json'
+                VERSION=$(node -p "require('./extension/package.json').version")
+                rm -rf extension
+                node -e "
+                  const fs = require('fs');
+                  const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+                  pkg.version = '$VERSION';
+                  fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+                "
+                echo "Set extension version to $VERSION"
+              else
+                echo "No Copilot VSIX found, using version from package.json"
+              fi
+            displayName: 📋 Sync version from extension
+            workingDirectory: extensions/copilot
+
+          - bash: npm ci && npm run extract-chat-lib && rm -rf node_modules
+            displayName: 📂 Extract chat-lib
+            workingDirectory: extensions/copilot
+            env:
+              PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+
+          - bash: |
+              set -e
+              VERSION=$(node -p "require('../package.json').version")
+              node -e "
+                const fs = require('fs');
+                const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+                pkg.version = '$VERSION';
+                fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+              "
+              echo "Set chat-lib version to $VERSION"
+            displayName: 📋 Sync chat-lib version
+            workingDirectory: extensions/copilot/chat-lib
+
+          - script: npm ci
+            displayName: 📦 Install chat-lib dependencies
+            workingDirectory: extensions/copilot/chat-lib
+
+          - script: npm run build
+            displayName: 🔨 Build chat-lib
+            workingDirectory: extensions/copilot/chat-lib
+        testPlatforms:
+          - name: Linux
+            nodeVersions: [22.x]
+          - name: MacOS
+            nodeVersions: [22.x]
+          - name: Windows
+            nodeVersions: [22.x]
+        workingDirectory: extensions/copilot/chat-lib
+        testSteps:
+          - template: extensions/copilot/build/steps/test-chat-lib.yml@self
+            parameters:
+              NPM_REGISTRY: ${{ parameters.NPM_REGISTRY }}
+        # Triggered by ⭐️ VS Code pipeline → always publish to next
+        publishPackage: true
+        publishRequiresApproval: false
+        tag: next
+        ghCreateRelease: false
+        ghReleaseAddChangeLog: false

extensions/copilot/build/npm-package.yml

@@ -3,11 +3,9 @@ trigger:
   branches:
     include:
       - main
-  tags:
-    include:
-      - v*
+      - release/*
 
-pr: [main]
+pr: none
 
 resources:
   repositories:
@@ -18,6 +16,10 @@ resources:
       endpoint: Monaco
 
 parameters:
+  - name: NPM_REGISTRY
+    displayName: "Custom NPM Registry"
+    type: string
+    default: 'https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/'
   - name: nextVersion
     displayName: '🚀 Release Version (eg: none, major, minor, patch, prerelease, or X.X.X)'
     type: string
@@ -31,58 +33,24 @@ extends:
     npmPackages:
       - name: vscode-copilot-chat
         buildSteps:
-          - task: NodeTool@0
-            inputs:
-              versionSpec: 22.x
-            displayName: 🛠 Install Node.js (22.x)
-
-          - bash: npm ci && npm run extract-chat-lib && rm -rf node_modules
-            displayName: 📂 Extract chat-lib
-
-          - script: npm ci
-            displayName: 📦 Install chat-lib dependencies
-            workingDirectory: chat-lib
-
-          - script: npm run build
-            displayName: 🔨 Build chat-lib
-            workingDirectory: chat-lib
+          - template: extensions/copilot/build/steps/build-chat-lib.yml@self
+            parameters:
+              NPM_REGISTRY: ${{ parameters.NPM_REGISTRY }}
         testPlatforms:
           - name: Linux
             nodeVersions: [22.x]
           - name: MacOS
             nodeVersions: [22.x]
           - name: Windows
             nodeVersions: [22.x]
-        workingDirectory: chat-lib
+        workingDirectory: extensions/copilot/chat-lib
         testSteps:
-          - bash: npm ci && npm run extract-chat-lib && rm -rf node_modules
-            displayName: 📂 Extract chat-lib
-
-          - script: npm ci
-            displayName: 📦 Install chat-lib dependencies
-            workingDirectory: chat-lib
-
-          - script: npm run build
-            displayName: 🔨 Build chat-lib
-            workingDirectory: chat-lib
-
-          - script: npm test
-            displayName: 🧪 Run chat-lib tests
-            workingDirectory: chat-lib
-        # Tag-triggered: date-stamped patch (e.g., v0.40.2026031601) → publish to next
-        ${{ if and(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), gt(length(variables['Build.SourceBranchName']), 13)) }}:
-          publishPackage: true
-          publishRequiresApproval: false
-          nextVersion: ${{ replace(variables['Build.SourceBranchName'], 'v', '') }}
-          tag: next
-        # Tag-triggered: short patch (e.g., v0.39.1) → publish to latest
-        ${{ elseif startsWith(variables['Build.SourceBranch'], 'refs/tags/v') }}:
-          publishPackage: true
-          publishRequiresApproval: false
-          nextVersion: ${{ replace(variables['Build.SourceBranchName'], 'v', '') }}
-        ${{ elseif eq(parameters.nextVersion, 'none') }}:
+          - template: extensions/copilot/build/steps/test-chat-lib.yml@self
+            parameters:
+              NPM_REGISTRY: ${{ parameters.NPM_REGISTRY }}
+        # Manually triggered → publish to latest or next
+        ${{ if eq(parameters.nextVersion, 'none') }}:
           publishPackage: false
-        # Manual prerelease → publish to next
         ${{ elseif eq(parameters.nextVersion, 'prerelease') }}:
           publishPackage: true
           publishRequiresApproval: false
@@ -92,4 +60,4 @@ extends:
           publishPackage: true
           nextVersion: ${{ parameters.nextVersion }}
         ghCreateRelease: false
-        ghReleaseAddChangeLog: false
+        ghReleaseAddChangeLog: false