[pull] main from microsoft:main

.github/skills/sessions/SKILL.md

@@ -25,6 +25,7 @@ Start with `src/vs/sessions/README.md`, then read only the specifications releva
 |------|---------------|
 | Layering, folder ownership, cross-module imports | `src/vs/sessions/LAYERS.md` |
 | Session/chat model, services, provider contract, core data flow | `src/vs/sessions/SESSIONS.md` |
+| Automations ownership, routing, migration, persistence, and run lifecycle | `src/vs/sessions/AUTOMATIONS.md` |
 | Workbench parts, grid, title bar, editor presentation | `src/vs/sessions/LAYOUT.md` |
 | Session-aware layout state and restoration | `src/vs/sessions/LAYOUT_CONTROLLER.md` |
 | Single-pane behavior and expected compositions | `src/vs/sessions/SINGLE_PANE_SCENARIOS.md` |

build/lib/preLaunch.ts

@@ -40,7 +40,7 @@ async function getElectron() {
 	// directory is being removed and re-extracted. Skip the refresh when the
 	// already-present Electron matches the expected version; any detection
 	// failure falls back to a (re)download to preserve the previous behavior.
-	if (await isExpectedElectronInstalled()) {
+	if (!process.env['VSCODE_FORCE_PRELAUNCH'] && await isExpectedElectronInstalled()) {
 		return;
 	}
 	await runProcess(npm, ['run', 'electron']);
@@ -66,9 +66,6 @@ async function ensureCompiled() {
 async function main() {
 	await ensureNodeModules();
 	await getElectron();
-	if (process.argv.includes('--only-electron')) {
-		return;
-	}
 	await ensureCompiled();
 
 	// Can't require this until after dependencies are installed

build/linux/rpm/dep-lists.ts

@@ -81,7 +81,6 @@ export const referenceGeneratedDepsByArch = {
 		'libgtk-3.so.0()(64bit)',
 		'libm.so.6()(64bit)',
 		'libm.so.6(GLIBC_2.2.5)(64bit)',
-		'libm.so.6(GLIBC_2.27)(64bit)',
 		'libnspr4.so()(64bit)',
 		'libnss3.so()(64bit)',
 		'libnss3.so(NSS_3.11)(64bit)',
@@ -276,7 +275,6 @@ export const referenceGeneratedDepsByArch = {
 		'libgtk-3.so.0()(64bit)',
 		'libm.so.6()(64bit)',
 		'libm.so.6(GLIBC_2.17)(64bit)',
-		'libm.so.6(GLIBC_2.27)(64bit)',
 		'libnspr4.so()(64bit)',
 		'libnss3.so()(64bit)',
 		'libnss3.so(NSS_3.11)(64bit)',

cli/Cargo.toml

@@ -56,8 +56,8 @@ console = "0.15.7"
 bytes = "1.11.1"
 tar = "0.4.46"
 local-ip-address = "0.6"
-ahp = "0.7.0"
-ahp-types = "0.7.0"
+ahp = "0.9.0"
+ahp-types = "0.9.0"
 
 [build-dependencies]
 serde = { version="1.0.163", features = ["derive"] }

cli/src/commands/agent.rs

@@ -366,6 +366,7 @@ async fn authenticate_from_error(
 					resource: resource.resource.clone(),
 					token: credential.access_token().to_string(),
 					scopes: None,
+					meta: None,
 				},
 			)
 			.await

cli/src/commands/agent_discovery.rs

@@ -139,6 +139,7 @@ async fn probe_host(
 			channel: ROOT_RESOURCE_URI.to_string(),
 			limit: None,
 			cursor: None,
+			meta: None,
 		},
 	)
 	.await;

cli/src/commands/agent_ps.rs

@@ -123,6 +123,7 @@ async fn list_sessions(
 				channel: ROOT_RESOURCE_URI.to_string(),
 				limit: None,
 				cursor,
+				meta: None,
 			},
 		)
 		.await?;
@@ -417,6 +418,7 @@ mod tests {
 			modified_at: modified_at.to_string(),
 			project: None,
 			working_directories: None,
+			origin: None,
 			changes: None,
 			annotations: None,
 			meta: None,

extensions/copilot/package.json

@@ -4389,7 +4389,7 @@
               "null"
             ],
             "default": null,
-            "markdownDescription": "Overrides the routing tier that the `Auto` model requests, ignoring both the tier picked in the model picker and the tier inline chat defaults to. Accepts `eco`, `balanced`, `max`, or `fast`. Used by evals.\n\n**Note**: This is an advanced debugging setting.",
+            "markdownDescription": "Overrides the routing tier that the `Auto` model requests, ignoring both the tier picked in the model picker and the tier inline chat defaults to. Accepts `efficiency`, `balance`, `intelligence`, or `fast`. Used by evals.\n\n**Note**: This is an advanced debugging setting.",
             "tags": [
               "advanced"
             ]

extensions/copilot/src/extension/conversation/common/languageModelAccess.ts

@@ -90,9 +90,9 @@ export function buildReasoningEffortSchemaProperty(effortLevels: readonly string
  */
 export function getAutoModeTierLabel(tier: string): string {
 	switch (tier) {
-		case 'eco': return l10n.t('Efficiency');
-		case 'balanced': return l10n.t('Balance');
-		case 'max': return l10n.t('Intelligence');
+		case 'efficiency': return l10n.t('Efficiency');
+		case 'balance': return l10n.t('Balance');
+		case 'intelligence': return l10n.t('Intelligence');
 		case 'fast': return l10n.t('Fast');
 		default: return tier.charAt(0).toUpperCase() + tier.slice(1);
 	}
@@ -104,9 +104,9 @@ export function getAutoModeTierLabel(tier: string): string {
  */
 export function getAutoModeTierDescription(tier: string): string {
 	switch (tier) {
-		case 'eco': return l10n.t('Cheaper models for everyday tasks');
-		case 'balanced': return l10n.t('Balances capability and cost');
-		case 'max': return l10n.t('Most capable models, higher cost');
+		case 'efficiency': return l10n.t('Cheaper models for everyday tasks');
+		case 'balance': return l10n.t('Balances capability and cost');
+		case 'intelligence': return l10n.t('Most capable models, higher cost');
 		case 'fast': return l10n.t('Lowest latency models');
 		default: return tier;
 	}

extensions/copilot/src/extension/conversation/vscode-node/test/languageModelAccess.test.ts

@@ -698,10 +698,10 @@ suite('auto mode tier schema', () => {
 		assert.deepStrictEqual(buildAutoModeTierSchemaProperty(selectableAutoModeTiers, defaultAutoModeTier), {
 			type: 'string',
 			title: 'Optimize for',
-			enum: ['eco', 'balanced', 'max'],
+			enum: ['efficiency', 'balance', 'intelligence'],
 			enumItemLabels: ['Efficiency', 'Balance', 'Intelligence'],
 			enumDescriptions: ['Cheaper models for everyday tasks', 'Balances capability and cost', 'Most capable models, higher cost'],
-			default: 'balanced',
+			default: 'balance',
 			group: 'navigation',
 		});
 	});

extensions/copilot/src/extension/xtab/common/promptCraftingUtils.ts

@@ -5,20 +5,26 @@
 
 import { DocumentId } from '../../../platform/inlineEdits/common/dataTypes/documentId';
 import { Schemas } from '../../../util/vs/base/common/network';
+import { isWindows } from '../../../util/vs/base/common/platform';
 
 export function toUniquePath(documentId: DocumentId, workspaceRootPath: string | undefined): string {
 	const filePath = documentId.path;
-	// remove prefix from path if defined
 	const workspaceRootPathWithSlash = workspaceRootPath === undefined ? undefined : (workspaceRootPath.endsWith('/') ? workspaceRootPath : workspaceRootPath + '/');
+	const documentScheme = documentId.toUri().scheme;
+	const isWorkspaceRelative = workspaceRootPathWithSlash !== undefined
+		&& normalizeWindowsDriveLetter(filePath).startsWith(normalizeWindowsDriveLetter(workspaceRootPathWithSlash));
 
-	const updatedFilePath = workspaceRootPathWithSlash !== undefined && filePath.startsWith(workspaceRootPathWithSlash)
+	const updatedFilePath = isWorkspaceRelative
 		? filePath.substring(workspaceRootPathWithSlash.length)
 		: filePath;
 
-	return documentId.toUri().scheme === Schemas.vscodeNotebookCell ? `${updatedFilePath}#${documentId.fragment}` : updatedFilePath;
+	return documentScheme === Schemas.vscodeNotebookCell ? `${updatedFilePath}#${documentId.fragment}` : updatedFilePath;
+}
+
+function normalizeWindowsDriveLetter(path: string): string {
+	return isWindows && /^\/[a-zA-Z]:/.test(path) ? `/${path[1].toLowerCase()}${path.substring(2)}` : path;
 }
 
 export function countTokensForLines(page: string[], computeTokens: (s: string) => number): number {
 	return page.reduce((sum, line) => sum + computeTokens(line) + 1 /* \n */, 0);
 }
-