[pull] main from microsoft:main

.github/workflows/chat-perf.yml

@@ -130,7 +130,7 @@ jobs:
         run: node build/lib/preLaunch.ts
 
       - name: Cache Electron
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           path: ~/.cache/electron
           key: electron-${{ runner.os }}-${{ hashFiles('.nvmrc', 'package.json') }}
@@ -139,7 +139,7 @@ jobs:
         run: npx playwright install chromium
 
       - name: Cache Playwright
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v5
         with:
           path: ~/.cache/ms-playwright
           key: playwright-${{ runner.os }}-${{ hashFiles('package.json') }}
@@ -220,7 +220,7 @@ jobs:
           name: build-output
 
       - name: Restore Electron cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ~/.cache/electron
           key: electron-${{ runner.os }}-${{ hashFiles('.nvmrc', 'package.json') }}
@@ -229,7 +229,7 @@ jobs:
         run: node build/lib/preLaunch.ts
 
       - name: Restore Playwright cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ~/.cache/ms-playwright
           key: playwright-${{ runner.os }}-${{ hashFiles('package.json') }}
@@ -393,7 +393,7 @@ jobs:
           name: build-output
 
       - name: Restore Electron cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ~/.cache/electron
           key: electron-${{ runner.os }}-${{ hashFiles('.nvmrc', 'package.json') }}
@@ -402,7 +402,7 @@ jobs:
         run: node build/lib/preLaunch.ts
 
       - name: Restore Playwright cache
-        uses: actions/cache/restore@v4
+        uses: actions/cache/restore@v5
         with:
           path: ~/.cache/ms-playwright
           key: playwright-${{ runner.os }}-${{ hashFiles('package.json') }}

.github/workflows/screenshot-test.yml

@@ -223,6 +223,9 @@ jobs:
         if: steps.blocks-ci.outputs.match == 'false'
         run: |
           echo "::error::blocks-ci screenshot hashes do not match committed file. See PR comment for updated content."
+          echo ""
+          echo "Diff between committed and expected blocks-ci-screenshots.md:"
+          diff -u test/componentFixtures/blocks-ci-screenshots.md /tmp/blocks-ci-updated.md || true
           exit 1
 
       # - name: Compare screenshots

build/azure-pipelines/product-build.yml

@@ -2,12 +2,22 @@ pr: none
 
 schedules:
   - cron: "0 5 * * Mon-Fri"
-    displayName: Mon-Fri at 7:00
+    displayName: Mon-Fri at 5:00 UTC (build, publish and release)
+    branches:
+      include:
+        - main
+  - cron: "0 11 * * Mon-Fri"
+    displayName: Mon-Fri at 11:00 UTC (build, and publish)
     branches:
       include:
         - main
   - cron: "0 17 * * Mon-Fri"
-    displayName: Mon-Fri at 19:00
+    displayName: Mon-Fri at 17:00 UTC (build, publish, and release)
+    branches:
+      include:
+        - main
+  - cron: "0 23 * * Mon-Fri"
+    displayName: Mon-Fri at 23:00 UTC (build, and publish)
     branches:
       include:
         - main

build/azure-pipelines/product-publish.yml

@@ -116,6 +116,8 @@ jobs:
 
       - ${{ if and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(parameters.VSCODE_SCHEDULEDBUILD, true)) }}:
         - script: node build/azure-pipelines/common/releaseBuild.ts
+          # Only release on the 05:00 and 17:00 UTC schedules (skip the 11:00 and 23:00 UTC schedules)
+          condition: and(succeeded(), or(eq(format('{0:HH}', pipeline.startTime), '05'), eq(format('{0:HH}', pipeline.startTime), '17')))
           env:
             PUBLISH_AUTH_TOKENS: "$(PUBLISH_AUTH_TOKENS)"
           displayName: Release build

build/rspack/package.json

@@ -9,7 +9,8 @@
   "devDependencies": {
     "@rspack/cli": "^1.3.18",
     "@rspack/core": "^1.3.18",
-    "@vscode/esm-url-webpack-plugin": "^1.0.1-3"
+    "@vscode/esm-url-webpack-plugin": "^1.0.1-3",
+    "source-map-loader": "^5.0.0"
   },
   "dependencies": {
     "@vscode/component-explorer": "^0.2.1-17",

build/rspack/rspack.serve-out.config.mts

@@ -28,6 +28,7 @@ export default {
 	context: repoRoot,
 	mode: 'development',
 	target: 'web',
+	devtool: 'source-map',
 	entry: {
 		workbench: path.join(repoRoot, 'out', 'vs', 'code', 'browser', 'workbench', 'workbench.js'),
 	},
@@ -38,12 +39,30 @@ export default {
 		assetModuleFilename: 'bundled/assets/[name][ext][query]',
 		publicPath: '/',
 		clean: true,
+		devtoolModuleFilenameTemplate: (info: { absoluteResourcePath: string }) => {
+			return `file:///${info.absoluteResourcePath.replace(/\\/g, '/')}`;
+		},
+	},
+	resolve: {
+		fallback: {
+			path: path.resolve(repoRoot, 'node_modules', 'path-browserify'),
+			fs: false,
+			module: false,
+		},
+	},
+	resolveLoader: {
+		modules: [path.join(__dirname, 'node_modules'), 'node_modules'],
 	},
 	experiments: {
 		css: true,
 	},
 	module: {
 		rules: [
+			{
+				test: /\.js$/,
+				enforce: 'pre',
+				use: ['source-map-loader'],
+			},
 			{
 				test: /\.css$/,
 				type: 'css',

extensions/copilot/package.json

@@ -5040,7 +5040,7 @@
 				},
 				{
 					"command": "github.copilot.chat.createPullRequestCopilotCLIAgentSession.updatePR",
-					"when": "chatSessionType == copilotcli && isSessionsWindow && sessions.isolationMode == worktree && sessions.hasGitRepository && sessions.hasGitHubRemote && sessions.hasPullRequest && sessions.hasOpenPullRequest",
+					"when": "chatSessionType == copilotcli && isSessionsWindow && sessions.isolationMode == worktree && sessions.hasGitRepository && sessions.hasGitHubRemote && sessions.hasPullRequest && sessions.hasOpenPullRequest && (sessions.hasIncomingChanges || sessions.hasOutgoingChanges || sessions.hasUncommittedChanges)",
 					"group": "pull_request@1"
 				},
 				{

extensions/copilot/src/extension/chatSessions/common/chatSessionMetadataStore.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import type * as vscode from 'vscode';
-import type { Uri } from 'vscode';
 import { createServiceIdentifier } from '../../../util/common/services';
 import { ChatSessionWorktreeProperties } from './chatSessionWorktreeService';
 import type { IWorkspaceInfo } from './workspaceInfo';
@@ -118,9 +117,7 @@ export interface IChatSessionMetadataStore {
 	storeWorkspaceFolderInfo(sessionId: string, entry: WorkspaceFolderEntry): Promise<void>;
 	storeRepositoryProperties(sessionId: string, properties: RepositoryProperties): Promise<void>;
 	getRepositoryProperties(sessionId: string): Promise<RepositoryProperties | undefined>;
-	getSessionIdForWorktree(folder: vscode.Uri): Promise<string | undefined>;
 	getWorktreeProperties(sessionId: string): Promise<ChatSessionWorktreeProperties | undefined>;
-	getWorktreeProperties(folder: Uri): Promise<ChatSessionWorktreeProperties | undefined>;
 	getSessionWorkspaceFolder(sessionId: string): Promise<vscode.Uri | undefined>;
 	getSessionWorkspaceFolderEntry(sessionId: string): Promise<WorkspaceFolderEntry | undefined>;
 	getAdditionalWorkspaces(sessionId: string): Promise<IWorkspaceInfo[]>;
@@ -147,4 +144,13 @@ export interface IChatSessionMetadataStore {
 	 * on demand. Concurrent calls collapse: at most one in-flight + one pending.
 	 */
 	refresh(): Promise<void>;
+	/**
+	 * Returns session IDs whose working directory (worktree path or workspace folder)
+	 * matches the given folder URI.
+	 */
+	getSessionIdsForFolder(folder: vscode.Uri): string[];
+	/**
+	 * Returns session IDs that have a worktree whose path matches the given folder URI.
+	 */
+	getWorktreeSessions(folder: vscode.Uri): string[];
 }

extensions/copilot/src/extension/chatSessions/common/chatSessionWorktreeService.ts

@@ -63,16 +63,13 @@ export interface IChatSessionWorktreeService {
 	createWorktree(repositoryPath: vscode.Uri, stream?: vscode.ChatResponseStream, baseBranch?: string, branchName?: string): Promise<ChatSessionWorktreeProperties | undefined>;
 
 	getWorktreeProperties(sessionId: string): Promise<ChatSessionWorktreeProperties | undefined>;
-	getWorktreeProperties(folder: vscode.Uri): Promise<ChatSessionWorktreeProperties | undefined>;
 	setWorktreeProperties(sessionId: string, properties: string | ChatSessionWorktreeProperties): Promise<void>;
 
 	getWorktreeRepository(sessionId: string): Promise<RepoContext | undefined>;
 	getWorktreePath(sessionId: string): Promise<vscode.Uri | undefined>;
 
 	applyWorktreeChanges(sessionId: string): Promise<void>;
 
-	getSessionIdForWorktree(folder: vscode.Uri): Promise<string | undefined>;
-
 	getWorktreeChanges(sessionId: string): Promise<readonly vscode.ChatSessionChangedFile[] | undefined>;
 
 	hasCachedChanges(sessionId: string): Promise<boolean>;

extensions/copilot/src/extension/chatSessions/common/test/mockChatSessionMetadataStore.ts

@@ -54,11 +54,8 @@ export class MockChatSessionMetadataStore implements IChatSessionMetadataStore {
 		return undefined;
 	}
 
-	async getWorktreeProperties(sessionIdOrFolder: string | vscode.Uri): Promise<ChatSessionWorktreeProperties | undefined> {
-		if (typeof sessionIdOrFolder === 'string') {
-			return this._worktreeProperties.get(sessionIdOrFolder);
-		}
-		return undefined;
+	async getWorktreeProperties(sessionId: string): Promise<ChatSessionWorktreeProperties | undefined> {
+		return this._worktreeProperties.get(sessionId);
 	}
 
 	async getSessionWorkspaceFolder(_sessionId: string): Promise<vscode.Uri | undefined> {
@@ -155,4 +152,31 @@ export class MockChatSessionMetadataStore implements IChatSessionMetadataStore {
 	getSessionParentId(_sessionId: string): Promise<string | undefined> {
 		return Promise.resolve(undefined);
 	}
+
+	getSessionIdsForFolder(folder: vscode.Uri): string[] {
+		const folderPath = folder.fsPath;
+		const sessionIds: string[] = [];
+		for (const [sessionId, props] of this._worktreeProperties) {
+			if (props.worktreePath === folderPath) {
+				sessionIds.push(sessionId);
+			}
+		}
+		for (const [sessionId, entry] of this._workspaceFolders) {
+			if (entry.folderPath === folderPath && !sessionIds.includes(sessionId)) {
+				sessionIds.push(sessionId);
+			}
+		}
+		return sessionIds;
+	}
+
+	getWorktreeSessions(folder: vscode.Uri): string[] {
+		const folderPath = folder.fsPath;
+		const sessionIds: string[] = [];
+		for (const [sessionId, props] of this._worktreeProperties) {
+			if (props.worktreePath === folderPath) {
+				sessionIds.push(sessionId);
+			}
+		}
+		return sessionIds;
+	}
 }