[pull] main from microsoft:main

extensions/markdown-language-features/src/preview/preview.ts

@@ -129,8 +129,9 @@ class MarkdownPreview extends Disposable implements WebviewResourceProvider {
 			const watcher = this._register(vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(resource, '*')));
 			this._register(watcher.onDidChange(uri => {
 				if (this.isPreviewOf(uri)) {
-					// Only use the file system event when VS Code does not already know about the file
-					if (!vscode.workspace.textDocuments.some(doc => doc.uri.toString() === uri.toString())) {
+					// Only use the file system event when VS Code does not already know about the file.
+					// This is needed to avoid duplicate refreshes
+					if (!vscode.workspace.textDocuments.some(doc => areUrisEqual(doc.uri, uri))) {
 						this.refresh();
 					}
 				}

extensions/markdown-language-features/src/util/resources.ts

@@ -21,7 +21,7 @@ export function areUrisEqual(uri1: vscode.Uri, uri2: vscode.Uri): boolean {
 	}
 
 	if (uri1.scheme === 'file') {
-		if (process.platform === 'win32') {
+		if (process.platform === 'win32' || process.platform === 'darwin') {
 			return uri1.fsPath.toLowerCase() === uri2.fsPath.toLowerCase();
 		}
 

extensions/vscode-api-tests/src/singlefolder-tests/chat.runInTerminal.test.ts

@@ -71,7 +71,7 @@ function extractTextContent(result: vscode.LanguageModelToolResult): string {
 		participantRegistered = false;
 		pendingResult = undefined;
 		pendingCommand = undefined;
-		pendingTimeout = undefined;
+		pendingOptions = undefined;
 
 		const chatToolsConfig = vscode.workspace.getConfiguration('chat.tools.global');
 		await chatToolsConfig.update('autoApprove', undefined, vscode.ConfigurationTarget.Global);
@@ -82,10 +82,16 @@ function extractTextContent(result: vscode.LanguageModelToolResult): string {
 	 * Helper: invokes run_in_terminal via a chat participant and returns the tool result text.
 	 * Each call creates a new chat session to avoid participant re-registration issues.
 	 */
+	interface RunInTerminalOptions {
+		timeout?: number;
+		requestUnsandboxedExecution?: boolean;
+		requestUnsandboxedExecutionReason?: string;
+	}
+
 	let participantRegistered = false;
 	let pendingResult: DeferredPromise<vscode.LanguageModelToolResult> | undefined;
 	let pendingCommand: string | undefined;
-	let pendingTimeout: number | undefined;
+	let pendingOptions: RunInTerminalOptions | undefined;
 
 	function setupParticipant() {
 		if (participantRegistered) {
@@ -98,18 +104,22 @@ function extractTextContent(result: vscode.LanguageModelToolResult): string {
 			}
 			const currentResult = pendingResult;
 			const currentCommand = pendingCommand;
-			const currentTimeout = pendingTimeout ?? 15000;
+			const currentOptions = pendingOptions ?? {};
 			pendingResult = undefined;
 			pendingCommand = undefined;
-			pendingTimeout = undefined;
+			pendingOptions = undefined;
 			try {
 				const result = await vscode.lm.invokeTool('run_in_terminal', {
 					input: {
 						command: currentCommand,
 						explanation: 'Integration test command',
 						goal: 'Test run_in_terminal output',
 						isBackground: false,
-						timeout: currentTimeout
+						timeout: currentOptions.timeout ?? 15000,
+						...currentOptions.requestUnsandboxedExecution ? {
+							requestUnsandboxedExecution: true,
+							requestUnsandboxedExecutionReason: currentOptions.requestUnsandboxedExecutionReason,
+						} : {},
 					},
 					toolInvocationToken: request.toolInvocationToken,
 				});
@@ -122,13 +132,18 @@ function extractTextContent(result: vscode.LanguageModelToolResult): string {
 		disposables.push(participant);
 	}
 
-	async function invokeRunInTerminal(command: string, timeout = 15000): Promise<string> {
+	async function invokeRunInTerminal(command: string, options?: RunInTerminalOptions): Promise<string>;
+	async function invokeRunInTerminal(command: string, timeout?: number): Promise<string>;
+	async function invokeRunInTerminal(command: string, optionsOrTimeout?: RunInTerminalOptions | number): Promise<string> {
 		setupParticipant();
 
+		const opts: RunInTerminalOptions = typeof optionsOrTimeout === 'number'
+			? { timeout: optionsOrTimeout }
+			: optionsOrTimeout ?? {};
 		const resultPromise = new DeferredPromise<vscode.LanguageModelToolResult>();
 		pendingResult = resultPromise;
 		pendingCommand = command;
-		pendingTimeout = timeout;
+		pendingOptions = opts;
 
 		await vscode.commands.executeCommand('workbench.action.chat.newChat');
 		vscode.commands.executeCommand('workbench.action.chat.open', { query: '@participant test' });
@@ -326,6 +341,27 @@ function extractTextContent(result: vscode.LanguageModelToolResult): string {
 				assert.ok(acceptable.includes(output.trim()), `Unexpected output: ${JSON.stringify(output.trim())}`);
 			});
 
+			test('requestUnsandboxedExecution preserves sandbox $TMPDIR', async function () {
+				this.timeout(60000);
+
+				const marker = `SANDBOX_UNSANDBOX_${Date.now()}`;
+				const sentinelName = `sentinel-${marker}.txt`;
+
+				// Step 1: Write a sentinel file into the sandbox-provided $TMPDIR.
+				const writeOutput = await invokeRunInTerminal(`echo ${marker} > "$TMPDIR/${sentinelName}" && echo ${marker}`);
+				assert.strictEqual(writeOutput.trim(), marker);
+
+				// Step 2: Retry with requestUnsandboxedExecution=true while sandbox
+				// stays enabled. The tool should preserve $TMPDIR from the sandbox so
+				// the sentinel file created in step 1 is still accessible.
+				const retryOutput = await invokeRunInTerminal(`cat "$TMPDIR/${sentinelName}"`, {
+					timeout: 30000,
+					requestUnsandboxedExecution: true,
+					requestUnsandboxedExecutionReason: 'Need to verify $TMPDIR persists on unsandboxed retry',
+				});
+				assert.strictEqual(retryOutput.trim(), marker);
+			});
+
 			test('cannot write to /tmp', async function () {
 				this.timeout(60000);
 

src/vs/base/browser/ui/contextview/contextview.ts

@@ -235,8 +235,8 @@ export class ContextView extends Disposable {
 
 		// Get anchor
 		const anchor = getAnchorRect(this.delegate!.getAnchor());
-		const activeWindow = DOM.getActiveWindow();
-		const viewport = { top: activeWindow.pageYOffset, left: activeWindow.pageXOffset, width: activeWindow.innerWidth, height: activeWindow.innerHeight };
+		const containerWindow = this.container ? DOM.getWindow(this.container) : DOM.getActiveWindow();
+		const viewport = { top: containerWindow.pageYOffset, left: containerWindow.pageXOffset, width: containerWindow.innerWidth, height: containerWindow.innerHeight };
 		const view = { width: DOM.getTotalWidth(this.view), height: DOM.getTotalHeight(this.view) };
 		const anchorPosition = this.delegate!.anchorPosition;
 		const anchorAlignment = this.delegate!.anchorAlignment;

src/vs/platform/environment/common/argv.ts

@@ -75,6 +75,7 @@ export interface NativeParsedArgs {
 	'extensions-dir'?: string;
 	'extensions-download-dir'?: string;
 	'builtin-extensions-dir'?: string;
+	'agent-plugins-dir'?: string;
 	extensionDevelopmentPath?: string[]; // undefined or array of 1 or more local paths or URIs
 	extensionTestsPath?: string; // either a local path or a URI
 	extensionDevelopmentKind?: string[];

src/vs/platform/environment/common/environmentService.ts

@@ -147,6 +147,26 @@ export abstract class AbstractNativeEnvironmentService implements INativeEnviron
 		return joinPath(this.userHome, this.productService.dataFolderName, 'extensions').fsPath;
 	}
 
+	@memoize
+	get agentPluginsPath(): string {
+		const cliAgentPluginsDir = this.args['agent-plugins-dir'];
+		if (cliAgentPluginsDir) {
+			return resolve(cliAgentPluginsDir);
+		}
+
+		const vscodeAgentPlugins = env['VSCODE_AGENT_PLUGINS'];
+		if (vscodeAgentPlugins) {
+			return vscodeAgentPlugins;
+		}
+
+		const vscodePortable = env['VSCODE_PORTABLE'];
+		if (vscodePortable) {
+			return join(vscodePortable, 'agent-plugins');
+		}
+
+		return joinPath(this.userHome, this.productService.dataFolderName, 'agent-plugins').fsPath;
+	}
+
 	@memoize
 	get extensionDevelopmentLocationURI(): URI[] | undefined {
 		const extensionDevelopmentPaths = this.args.extensionDevelopmentPath;

src/vs/platform/environment/node/argv.ts

@@ -120,6 +120,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'extensions-download-dir': { type: 'string' },
 	'builtin-extensions-dir': { type: 'string' },
 	'list-extensions': { type: 'boolean', cat: 'e', description: localize('listExtensions', "List the installed extensions.") },
+	'agent-plugins-dir': { type: 'string' },
 	'show-versions': { type: 'boolean', cat: 'e', description: localize('showVersions', "Show versions of installed extensions, when using --list-extensions.") },
 	'category': { type: 'string', allowEmptyValue: true, cat: 'e', description: localize('category', "Filters installed extensions by provided category, when using --list-extensions."), args: 'category' },
 	'install-extension': { type: 'string[]', cat: 'e', args: 'ext-id | path', description: localize('installExtension', "Installs or updates an extension. The argument is either an extension id or a path to a VSIX. The identifier of an extension is '${publisher}.${name}'. Use '--force' argument to update to latest version. To install a specific version provide '@${version}'. For example: 'vscode.csharp@1.2.3'.") },

src/vs/sessions/contrib/chat/browser/newChatPermissionPicker.ts

@@ -163,11 +163,11 @@ export class NewChatPermissionPicker extends Disposable {
 			kind: ActionListItemKind.Action,
 			group: { kind: ActionListItemKind.Header, title: '', icon: Codicon.blank },
 			item: {
-				label: localize('permissions.learnMore', "Learn More about Permissions"),
+				label: localize('permissions.learnMore', "Learn more about permissions"),
 				icon: Codicon.blank,
 				checked: false,
 			},
-			label: localize('permissions.learnMore', "Learn More about Permissions"),
+			label: localize('permissions.learnMore', "Learn more about permissions"),
 			hideIcon: false,
 			disabled: false,
 		});

src/vs/sessions/contrib/configuration/browser/configuration.contribution.ts

@@ -31,7 +31,7 @@ Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerDefaultCon
 		'files.watcherExclude': {
 			'**/.git/objects/**': true,
 			'**/.git/subtree-cache/**': true,
-			'**/node_modules/*/**': true /* TODO@bpasero see if this helps improve perf */,
+			'**/node_modules/*/**': true,
 			'**/.hg/store/**': true
 		},
 

src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts

@@ -634,7 +634,7 @@ registerAction2(class AddChatAction extends Action2 {
 		super({
 			id: 'agentSession.addChat',
 			title: localize2('addChat', "Add Chat"),
-			icon: Codicon.plus,
+			icon: Codicon.newSession,
 			menu: [{
 				id: Menus.CommandCenter,
 				order: 102,

src/vs/workbench/api/common/extHostChatAgents2.ts

@@ -1038,7 +1038,6 @@ export class ExtHostChatAgents2 extends Disposable implements ExtHostChatAgentsS
 		const feedback: vscode.ChatResultFeedback = {
 			result: ehResult,
 			kind,
-			unhelpfulReason: isProposedApiEnabled(agent.extension, 'chatParticipantAdditions') ? voteAction.reason : undefined,
 		};
 		agent.acceptFeedback(Object.freeze(feedback));
 	}

src/vs/workbench/browser/workbench.contribution.ts

@@ -359,7 +359,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 					localize('useModal.all', "All editors open in a centered modal overlay."),
 				],
 				'description': localize('useModal', "Controls whether editors open in a modal overlay."),
-				'default': product.quality !== 'stable' ? 'some' : 'off', // TODO@bpasero figure out the default
+				'default': 'some',
 				tags: ['experimental'],
 				experiment: {
 					mode: 'auto'

src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.ts

@@ -21,7 +21,7 @@ import { CellEditType, CellKind, NOTEBOOK_EDITOR_ID } from '../../../notebook/co
 import { NOTEBOOK_IS_ACTIVE_EDITOR } from '../../../notebook/common/notebookContextKeys.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { applyingChatEditsFailedContextKey, isChatEditingActionContext } from '../../common/editing/chatEditingService.js';
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, IChatService } from '../../common/chatService/chatService.js';
+import { ChatAgentVoteDirection, IChatService } from '../../common/chatService/chatService.js';
 import { isResponseVM } from '../../common/model/chatViewModel.js';
 import { ChatModeKind } from '../../common/constants.js';
 import { IChatAccessibilityService, IChatWidgetService } from '../chat.js';
@@ -71,11 +71,9 @@ export function registerChatTitleActions() {
 				action: {
 					kind: 'vote',
 					direction: ChatAgentVoteDirection.Up,
-					reason: undefined
 				}
 			});
 			item.setVote(ChatAgentVoteDirection.Up);
-			item.setVoteDownReason(undefined);
 		}
 	});
 
@@ -108,13 +106,7 @@ export function registerChatTitleActions() {
 				return;
 			}
 
-			const reason = args[1];
-			if (typeof reason !== 'string') {
-				return;
-			}
-
 			item.setVote(ChatAgentVoteDirection.Down);
-			item.setVoteDownReason(reason as ChatAgentVoteDownReason);
 
 			const chatService = accessor.get(IChatService);
 			chatService.notifyUserAction({
@@ -126,7 +118,6 @@ export function registerChatTitleActions() {
 				action: {
 					kind: 'vote',
 					direction: ChatAgentVoteDirection.Down,
-					reason: item.voteDownReason
 				}
 			});
 		}

src/vs/workbench/contrib/chat/browser/agentPluginRepositoryService.ts

@@ -11,7 +11,7 @@ import { dirname, isEqual, isEqualOrParent, joinPath } from '../../../../base/co
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IEnvironmentService } from '../../../../platform/environment/common/environment.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -36,22 +36,40 @@ type IStoredMarketplaceIndex = Dto<Record<string, IMarketplaceIndexEntry>>;
 export class AgentPluginRepositoryService implements IAgentPluginRepositoryService {
 	declare readonly _serviceBrand: undefined;
 
+	readonly agentPluginsHome: URI;
 	private readonly _cacheRoot: URI;
 	private readonly _marketplaceIndex = new Lazy<Map<string, IMarketplaceIndexEntry>>(() => this._loadMarketplaceIndex());
 	private readonly _pluginSources: ReadonlyMap<PluginSourceKind, IPluginSource>;
 	private readonly _cloneSequencer = new SequencerByKey<string>();
+	private readonly _migrationDone: Promise<void>;
 
 	constructor(
 		@ICommandService private readonly _commandService: ICommandService,
-		@IEnvironmentService environmentService: IEnvironmentService,
+		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
 		@IFileService private readonly _fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@ILogService private readonly _logService: ILogService,
 		@INotificationService private readonly _notificationService: INotificationService,
 		@IProgressService private readonly _progressService: IProgressService,
 		@IStorageService private readonly _storageService: IStorageService,
 	) {
-		this._cacheRoot = joinPath(environmentService.cacheHome, 'agentPlugins');
+		// On native, use the well-known ~/{dataFolderName}/agent-plugins/ path
+		// so that external tools can discover it. On web, fall back to the
+		// internal cache location.
+		this.agentPluginsHome = environmentService.agentPluginsHome;
+		const legacyCacheRoot = joinPath(environmentService.cacheHome, 'agentPlugins');
+		const oldCacheRoot = environmentService.cacheHome.scheme === 'file'
+			? legacyCacheRoot
+			: this.agentPluginsHome;
+		this._cacheRoot = this.agentPluginsHome;
+
+		// Migrate plugin files from the old internal cache directory to the
+		// new well-known location. This is a one-time operation.
+		if (!isEqual(oldCacheRoot, this.agentPluginsHome)) {
+			this._migrationDone = this._migrateDirectory(oldCacheRoot);
+		} else {
+			this._migrationDone = Promise.resolve();
+		}
 
 		// Build per-kind source repository map via instantiation service so
 		// each repository can inject its own dependencies.
@@ -91,6 +109,7 @@ export class AgentPluginRepositoryService implements IAgentPluginRepositoryServi
 	}
 
 	async ensureRepository(marketplace: IMarketplaceReference, options?: IEnsureRepositoryOptions): Promise<URI> {
+		await this._migrationDone;
 		const repoDir = this.getRepositoryUri(marketplace, options?.marketplaceType);
 		return this._cloneSequencer.queue(repoDir.fsPath, async () => {
 			const repoExists = await this._fileService.exists(repoDir);
@@ -254,6 +273,7 @@ export class AgentPluginRepositoryService implements IAgentPluginRepositoryServi
 	}
 
 	async ensurePluginSource(plugin: IMarketplacePlugin, options?: IEnsureRepositoryOptions): Promise<URI> {
+		await this._migrationDone;
 		const repo = this.getPluginSource(plugin.sourceDescriptor.kind);
 		if (plugin.sourceDescriptor.kind === PluginSourceKind.RelativePath) {
 			return this.ensureRepository(plugin.marketplaceReference, options);
@@ -351,4 +371,34 @@ export class AgentPluginRepositoryService implements IAgentPluginRepositoryServi
 		}
 	}
 
+	/**
+	 * One-time migration of plugin files from the old internal cache
+	 * directory (`{cacheHome}/agentPlugins/`) to the new well-known
+	 * location (`~/{dataFolderName}/agent-plugins/`).
+	 */
+	private async _migrateDirectory(oldCacheRoot: URI): Promise<void> {
+		try {
+			const oldExists = await this._fileService.exists(oldCacheRoot);
+			if (!oldExists) {
+				return;
+			}
+
+			const newExists = await this._fileService.exists(this.agentPluginsHome);
+			if (newExists) {
+				this._logService.info('[AgentPluginRepositoryService] Both old and new agent-plugins directories exist; skipping directory migration');
+				return;
+			}
+
+			this._logService.info(`[AgentPluginRepositoryService] Migrating agent plugins from ${oldCacheRoot.toString()} to ${this.agentPluginsHome.toString()}`);
+			await this._fileService.move(oldCacheRoot, this.agentPluginsHome, false);
+
+			// Clear the marketplace index — it caches repository URIs that
+			// pointed to the old location and would cause path mismatches.
+			this._storageService.remove(MARKETPLACE_INDEX_STORAGE_KEY, StorageScope.APPLICATION);
+			this._marketplaceIndex.value.clear();
+		} catch (error) {
+			this._logService.error('[AgentPluginRepositoryService] Directory migration failed', error);
+		}
+	}
+
 }