h

.github/CODENOTIFY

@@ -13,10 +13,10 @@ src/vs/base/browser/ui/tree/** @benibenj
 
 # Platform
 src/vs/platform/agentHost/node/claude/** @TylerLeonhardt
-src/vs/platform/agentHost/**/*Automation* @ulugbekna
-src/vs/platform/agentHost/**/*automation* @ulugbekna
-src/vs/platform/agentHost/common/state/protocol/channels-automation-run/** @ulugbekna
-src/vs/platform/agentHost/common/state/protocol/channels-automation/** @ulugbekna
+src/vs/platform/agentHost/**/*Automation* @ulugbekna @benvillalobos
+src/vs/platform/agentHost/**/*automation* @ulugbekna @benvillalobos
+src/vs/platform/agentHost/common/state/protocol/channels-automation-run/** @ulugbekna @benvillalobos
+src/vs/platform/agentHost/common/state/protocol/channels-automation/** @ulugbekna @benvillalobos
 src/vs/platform/browserView/** @kycutler @jruales
 src/vs/platform/quickinput/** @TylerLeonhardt
 src/vs/platform/secrets/** @TylerLeonhardt
@@ -42,12 +42,12 @@ src/vs/workbench/services/views/** @sandy081 @benibenj
 # Workbench Contributions
 src/vs/workbench/contrib/authentication/** @TylerLeonhardt
 src/vs/workbench/contrib/browserView/** @kycutler @jruales
-src/vs/workbench/contrib/chat/**/*Automation* @ulugbekna
-src/vs/workbench/contrib/chat/**/*automation* @ulugbekna
+src/vs/workbench/contrib/chat/**/*Automation* @ulugbekna @benvillalobos
+src/vs/workbench/contrib/chat/**/*automation* @ulugbekna @benvillalobos
 src/vs/workbench/contrib/chat/browser/chatListRenderer.ts @roblourens
-src/vs/workbench/contrib/chat/common/automations/** @ulugbekna
+src/vs/workbench/contrib/chat/common/automations/** @ulugbekna @benvillalobos
 src/vs/workbench/contrib/chat/electron-browser/builtInTools/fetchPageTool.ts @TylerLeonhardt
-src/vs/workbench/contrib/chat/test/common/automations/** @ulugbekna
+src/vs/workbench/contrib/chat/test/common/automations/** @ulugbekna @benvillalobos
 src/vs/workbench/contrib/localization/** @TylerLeonhardt
 src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts @TylerLeonhardt
 src/vs/workbench/contrib/scm/** @lszomoru

build/npm/postinstall.ts

@@ -338,21 +338,6 @@ async function main() {
 		log('.', `Created ${claudeSkillsLinkType} .claude/skills -> .agents/skills`);
 	}
 
-	// Temporary: patch @github/copilot-sdk session.js to fix ESM import
-	// (missing .js extension on vscode-jsonrpc/node). Fixed upstream in v0.1.32.
-	// TODO: Remove once @github/copilot-sdk is updated to >=0.1.32
-	for (const dir of ['', 'remote']) {
-		const sessionFile = path.join(root, dir, 'node_modules', '@github', 'copilot-sdk', 'dist', 'session.js');
-		if (fs.existsSync(sessionFile)) {
-			const content = fs.readFileSync(sessionFile, 'utf8');
-			const patched = content.replace(/from "vscode-jsonrpc\/node"/g, 'from "vscode-jsonrpc/node.js"');
-			if (content !== patched) {
-				fs.writeFileSync(sessionFile, patched);
-				log(dir || '.', 'Patched @github/copilot-sdk session.js (vscode-jsonrpc ESM import fix)');
-			}
-		}
-	}
-
 	// foundry-local-sdk (on-device chat dictation) resolves its prebuilt N-API
 	// addon and native core libraries from fixed, package-relative paths. We do
 	// not ship that native payload (its addon requires a newer glibc than our

extensions/copilot/src/platform/telemetry/test/node/experimentation.spec.ts

@@ -848,9 +848,9 @@ describe('ExP Service scoped treatment resolution', () => {
 		const delegate = service.delegates[0];
 
 		// The new assignments endpoint returns the key with a `/vscode/` scope prefix only.
-		delegate.setTreatment('/vscode/config.chat.copilot.subagentModelGuidance.enabled', true);
+		delegate.setTreatment('/vscode/config.test.scopedTreatment', true);
 
-		expect(service.getTreatmentVariable<boolean>('config.chat.copilot.subagentModelGuidance.enabled')).toBe(true);
+		expect(service.getTreatmentVariable<boolean>('config.test.scopedTreatment')).toBe(true);
 
 		service.dispose();
 	});

extensions/git/src/cloneManager.ts

@@ -211,9 +211,10 @@ export class CloneManager {
 	}
 
 	private async tryOpenExistingRepository(cachedRepository: RepositoryCacheInfo[], url: string, postCloneAction?: ApiPostCloneAction, parentPath?: string, ref?: string, returnRepositoryPath?: boolean): Promise<string | undefined> {
-		// Gather existing folders/workspace files (ignore ones that no longer exist)
+		// Ignore cached entries whose requested path no longer exists.
 		const existingCachedRepositories: RepositoryCacheInfo[] = (await Promise.all<RepositoryCacheInfo | undefined>(cachedRepository.map(async folder => {
-			const stat = await fs.promises.stat(folder.workspacePath).catch(() => undefined);
+			const cachedPath = returnRepositoryPath ? folder.repositoryPath : folder.workspacePath;
+			const stat = await fs.promises.stat(cachedPath).catch(() => undefined);
 			if (stat) {
 				return folder;
 			}

extensions/git/src/test/cloneManager.test.ts

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'mocha';
+import * as assert from 'assert';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CloneManager } from '../cloneManager';
+import type { RepositoryCacheInfo } from '../repositoryCache';
+
+interface ICloneManagerHarness {
+	cloneRepository(url: string, parentPath?: string): Promise<string | undefined>;
+}
+
+const tryOpenExistingRepository = Reflect.get(CloneManager.prototype, 'tryOpenExistingRepository') as (
+	this: ICloneManagerHarness,
+	cachedRepository: RepositoryCacheInfo[],
+	url: string,
+	postCloneAction?: 'none',
+	parentPath?: string,
+	ref?: string,
+	returnRepositoryPath?: boolean,
+) => Promise<string | undefined>;
+
+suite('CloneManager', () => {
+	test('clones again when a cached repository path was deleted', async () => {
+		const workspacePath = await fs.promises.mkdtemp(path.join(os.tmpdir(), 'vscode-git-clone-manager-'));
+		const repositoryPath = path.join(workspacePath, 'deleted-repository');
+		const calls: { url: string; parentPath: string | undefined }[] = [];
+		try {
+			const result = await tryOpenExistingRepository.call({
+				cloneRepository: async (url, parentPath) => {
+					calls.push({ url, parentPath });
+					return '/repos/recloned';
+				},
+			}, [{ workspacePath, repositoryPath }], 'https://github.com/microsoft/vscode.git', 'none', '/repos', undefined, true);
+
+			assert.deepStrictEqual({ result, calls }, {
+				result: '/repos/recloned',
+				calls: [{ url: 'https://github.com/microsoft/vscode.git', parentPath: '/repos' }],
+			});
+		} finally {
+			await fs.promises.rm(workspacePath, { recursive: true, force: true });
+		}
+	});
+});

src/vs/base/common/uri.ts

@@ -707,15 +707,16 @@ function _asFormatted(uri: URI, skipEncoding: boolean): string {
 		}
 	}
 	if (path) {
-		// lower-case windows drive letters in /C:/fff or C:/fff
+		// HTTP paths are case-sensitive, even when their first segment resembles a drive letter.
+		const lowerScheme = scheme.toLowerCase();
 		if (path.length >= 3 && path.charCodeAt(0) === CharCode.Slash && path.charCodeAt(2) === CharCode.Colon) {
 			const code = path.charCodeAt(1);
-			if (code >= CharCode.A && code <= CharCode.Z) {
+			if (code >= CharCode.A && code <= CharCode.Z && lowerScheme !== 'http' && lowerScheme !== 'https') {
 				path = `/${String.fromCharCode(code + 32)}:${path.substr(3)}`; // "/c:".length === 3
 			}
 		} else if (path.length >= 2 && path.charCodeAt(1) === CharCode.Colon) {
 			const code = path.charCodeAt(0);
-			if (code >= CharCode.A && code <= CharCode.Z) {
+			if (code >= CharCode.A && code <= CharCode.Z && lowerScheme !== 'http' && lowerScheme !== 'https') {
 				path = `${String.fromCharCode(code + 32)}:${path.substr(2)}`; // "/c:".length === 3
 			}
 		}

src/vs/base/test/common/uri.test.ts

@@ -379,6 +379,26 @@ suite('URI', () => {
 		assert.strictEqual(URI.parse('untitled:C:/Users/jrieken/Code/abc.txt').toString(), 'untitled:c%3A/Users/jrieken/Code/abc.txt');
 	});
 
+	test('URI#toString preserves drive-like HTTP path case', () => {
+		const schemes = ['http', 'https', 'HtTp', 'HTTPS'];
+		assert.deepStrictEqual(schemes.map(scheme => {
+			const uri = URI.parse(`${scheme}://example.test/C:/Secret`);
+			return [uri.toString(), uri.toString(true), URI.parse(uri.toString()).toString(true)];
+		}), schemes.map(scheme => [
+			`${scheme}://example.test/C%3A/Secret`,
+			`${scheme}://example.test/C:/Secret`,
+			`${scheme}://example.test/C:/Secret`,
+		]));
+	});
+
+	test('URI#toString retains non-HTTP drive-letter normalization', () => {
+		const schemes = ['file', 'untitled', 'vscode-remote', 'custom'];
+		assert.deepStrictEqual(
+			schemes.map(scheme => URI.parse(`${scheme}://server/C:/Secret`).toString(true)),
+			schemes.map(scheme => `${scheme}://server/c:/Secret`),
+		);
+	});
+
 	test('URI#toString, escape all the bits', () => {
 
 		const value = URI.file('/Users/jrieken/Code/_samples/18500/Mödel + Other Thîngß/model.js');

src/vs/platform/agentHost/browser/agentHostProtocolClient.ts

@@ -1639,6 +1639,9 @@ export class AgentHostProtocolClient extends Disposable implements IAgentConnect
 		await this._sendRequest('createChat', {
 			channel: session.toString(),
 			chat: chat.toString(),
+			...(options?.workingDirectories !== undefined && !options.fork
+				? { workingDirectories: options.workingDirectories.map(directory => fromAgentHostUri(directory).toString()) }
+				: {}),
 			...(options?.fork ? {
 				source: { kind: ChatSourceKind.Fork, chat: options.fork.source.toString(), turnId: options.fork.turnId }
 			} : {}),

src/vs/platform/agentHost/common/copilotCliConfig.ts

@@ -38,8 +38,6 @@ export const enum CopilotCliConfigKey {
 	SkillCharBudget = 'skillCharBudget',
 	/** Override Auto's "Optimize for" preference. */
 	AutoModeTierOverride = 'autoModeTierOverride',
-	/** Tell the model to keep subagents on their default model unless the user asks otherwise. Off by default. */
-	SubagentModelGuidance = 'subagentModelGuidance',
 	/** Per-model capability overrides (family aliases) keyed by model id. */
 	ModelCapabilityOverrides = 'modelCapabilityOverrides',
 }
@@ -71,8 +69,6 @@ export const CopilotSkillCharBudgetSettingId = 'chat.copilot.skillCharBudget';
 
 export const CopilotAutoModeTierOverrideSettingId = 'github.copilot.chat.autoModeTierOverride';
 
-export const CopilotSubagentModelGuidanceEnabledSettingId = 'chat.copilot.subagentModelGuidance.enabled';
-
 export const AgentHostModelCapabilityOverridesSettingId = 'chat.agentHost.modelCapabilityOverrides';
 export const AgentHostCopilotModelCapabilityOverridesSettingId = 'chat.agentHost.copilot.modelCapabilityOverrides';
 
@@ -216,12 +212,6 @@ export const copilotCliConfigSchema = createSchema({
 		description: localize('agentHost.config.autoModeTierOverride.description', "Overrides Auto's \"Optimize for\" preference. Accepts efficiency, balance, or intelligence. Applied when a session is created or resumed and when its model changes. Empty or unsupported values use the picker or service defaults."),
 		default: '',
 	}),
-	[CopilotCliConfigKey.SubagentModelGuidance]: schemaProperty<boolean>({
-		type: 'boolean',
-		title: localize('agentHost.config.subagentModelGuidance.title', "Subagent Model Guidance"),
-		description: localize('agentHost.config.subagentModelGuidance.description', "When enabled, Copilot SDK sessions instruct the model to keep subagents on their default model unless the user explicitly names another one."),
-		default: false,
-	}),
 	[CopilotCliConfigKey.ModelCapabilityOverrides]: schemaProperty<CopilotCliModelCapabilityOverrides>({
 		type: 'object',
 		title: localize('agentHost.config.modelCapabilityOverrides.title', "Model Capability Overrides"),

src/vs/platform/agentHost/node/agentHostCatalogProjection.ts

@@ -299,6 +299,11 @@ const metadataValidator = plainObject(vObj({
 	[AH_META_DEV_CONTAINER_WORKTREE_DB_KEY]: vOptionalProp(devContainerWorktreeValidator),
 }));
 
+const workingDirectoriesValidator = new RefinedValidator(
+	boundedArray(uriString(), AGENT_HOST_CATALOG_CHILD_LIMIT),
+	value => hasUniqueValues(value, directory => directory) ? value : { message: 'Working directories must be unique.' },
+);
+
 const chatValidator = plainObject(vObj({
 	uri: uriString(),
 	order: safeInteger(),
@@ -307,6 +312,7 @@ const chatValidator = plainObject(vObj({
 	titleSource: vOptionalProp(vEnum('user', 'agent', 'auto')),
 	origin: vOptionalProp(jsonValue()),
 	inheritedTurnId: vOptionalProp(boundedString(AGENT_HOST_CATALOG_JSON_STRING_LENGTH_LIMIT)),
+	workingDirectories: vOptionalProp(workingDirectoriesValidator),
 }));
 
 const chatsValidator = new RefinedValidator(
@@ -323,11 +329,6 @@ const chatsValidator = new RefinedValidator(
 	},
 );
 
-const workingDirectoriesValidator = new RefinedValidator(
-	boundedArray(uriString(), AGENT_HOST_CATALOG_CHILD_LIMIT),
-	value => hasUniqueValues(value, directory => directory) ? value : { message: 'Working directories must be unique.' },
-);
-
 export const agentHostCatalogDataValidator = plainObject(vObj({
 	modifiedTime: safeInteger(),
 	summary: vOptionalProp(boundedString(AGENT_HOST_CATALOG_TITLE_LENGTH_LIMIT)),

src/vs/platform/agentHost/node/agentHostCatalogSourceResolver.ts

@@ -31,6 +31,7 @@ export interface ICatalogSourceState {
 		readonly title?: string;
 		readonly origin?: ChatOrigin;
 		readonly inheritedTurnId?: string;
+		readonly workingDirectories?: readonly string[];
 	}[];
 }
 
@@ -225,6 +226,7 @@ export class AgentHostCatalogSourceResolver {
 					titleSource: normalizeCatalogTitleSource(titleSource),
 					origin: toCatalogChatOrigin(chat.origin),
 					...(chat.inheritedTurnId !== undefined ? { inheritedTurnId: chat.inheritedTurnId } : {}),
+					...(chat.workingDirectories !== undefined ? { workingDirectories: chat.workingDirectories } : {}),
 				};
 			}),
 		};