Merge branch 'main' into osortega/chat-sessions-view

rebornix · web-flow · commit 0f7b9aadc934 · 2025-07-23T14:35:56.000-07:00
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -3398,6 +3398,7 @@ export class CommandCenter {
 
 	private async _createWorktree(repository: Repository, worktreePath?: string, name?: string, newBranch?: boolean): Promise<void> {
 		const config = workspace.getConfiguration('git');
+		const branchPrefix = config.get<string>('branchPrefix')!;
 		const showRefDetails = config.get<boolean>('showReferenceDetails') === true;
 
 		if (!name) {
@@ -3425,7 +3426,7 @@ export class CommandCenter {
 
 				newBranch = true;
 				name = branchName;
-			} else if (choice instanceof BranchItem && choice.refName) {
+			} else if (choice instanceof RefItem && choice.refName) {
 				name = choice.refName;
 			} else {
 				return;
@@ -3434,9 +3435,10 @@ export class CommandCenter {
 
 		const disposables: Disposable[] = [];
 		const inputBox = window.createInputBox();
+
 		inputBox.placeholder = l10n.t('Worktree name');
 		inputBox.prompt = l10n.t('Please provide a worktree name');
-		inputBox.value = name || '';
+		inputBox.value = name.startsWith(branchPrefix) ? name.substring(branchPrefix.length) : name;
 		inputBox.show();
 
 		const worktreeName = await new Promise<string | undefined>((resolve) => {
diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json
@@ -458,15 +458,6 @@
             "default": true,
             "markdownDescription": "%configuration.updateImportsOnPaste%"
           },
-          "typescript.experimental.expandableHover": {
-            "type": "boolean",
-            "default": true,
-            "description": "%configuration.expandableHover%",
-            "scope": "window",
-            "tags": [
-              "experimental"
-            ]
-          },
           "js/ts.hover.maximumLength": {
             "type": "number",
             "default": 500,
diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
@@ -225,7 +225,6 @@
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
 	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
-	"configuration.expandableHover": "Enable expanding/contracting the hover to reveal more/less information from the TS server. Requires TypeScript 5.9+.",
 	"configuration.hover.maximumLength": "The maximum number of characters in a hover. If the hover is longer than this, it will be truncated. Requires TypeScript 5.9+.",
 	"walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js",
 	"walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.",
diff --git a/extensions/typescript-language-features/src/languageFeatures/hover.ts b/extensions/typescript-language-features/src/languageFeatures/hover.ts
@@ -33,9 +33,8 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
 			return undefined;
 		}
 
-		const enableExpandableHover = vscode.workspace.getConfiguration('typescript').get<boolean>('experimental.expandableHover', true);
 		let verbosityLevel: number | undefined;
-		if (enableExpandableHover && this.client.apiVersion.gte(API.v590)) {
+		if (this.client.apiVersion.gte(API.v590)) {
 			verbosityLevel = Math.max(0, this.getPreviousLevel(context?.previousHover) + (context?.verbosityDelta ?? 0));
 		}
 		const args = { ...typeConverters.Position.toFileLocationRequestArgs(filepath, position), verbosityLevel };
diff --git a/src/vs/workbench/contrib/chat/browser/chat.ts b/src/vs/workbench/contrib/chat/browser/chat.ts
@@ -17,7 +17,7 @@ import { IChatAgentCommand, IChatAgentData } from '../common/chatAgents.js';
 import { IChatResponseModel } from '../common/chatModel.js';
 import { IParsedChatRequest } from '../common/chatParserTypes.js';
 import { CHAT_PROVIDER_ID } from '../common/chatParticipantContribTypes.js';
-import { IChatSendRequestOptions } from '../common/chatService.js';
+import { IChatElicitationRequest, IChatSendRequestOptions } from '../common/chatService.js';
 import { IChatRequestViewModel, IChatResponseViewModel, IChatViewModel } from '../common/chatViewModel.js';
 import { ChatAgentLocation, ChatModeKind } from '../common/constants.js';
 import { ChatAttachmentModel } from './chatAttachmentModel.js';
@@ -92,6 +92,7 @@ export interface IChatAccessibilityService {
 	readonly _serviceBrand: undefined;
 	acceptRequest(): number;
 	acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number, isVoiceInput?: boolean): void;
+	acceptElicitation(message: IChatElicitationRequest): void;
 }
 
 export interface IChatCodeBlockInfo {
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts b/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.ts
@@ -127,16 +127,31 @@ export class ChatAccessibilityProvider implements IListAccessibilityProvider<Cha
 				fileTreeCountHint = localize('multiFileTreeHint', "{0} file trees ", fileTreeCount);
 				break;
 		}
+
+		const elicitationCount = element.response.value.filter(v => v.kind === 'elicitation');
+		let elicitationHint = '';
+		for (const elicitation of elicitationCount) {
+			const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
+			const message = typeof elicitation.message === 'string' ? elicitation.message : elicitation.message.value;
+			elicitationHint += title + ' ' + message;
+		}
+
 		const codeBlockCount = marked.lexer(element.response.toString()).filter(token => token.type === 'code')?.length ?? 0;
 		switch (codeBlockCount) {
 			case 0:
-				label = accessibleViewHint ? localize('noCodeBlocksHint', "{0}{1}{2}{3} {4}", toolInvocationHint, fileTreeCountHint, tableCountHint, element.response.toString(), accessibleViewHint) : localize('noCodeBlocks', "{0} {1}", fileTreeCountHint, element.response.toString());
+				label = accessibleViewHint
+					? localize('noCodeBlocksHint', "{0}{1}{2}{3}{4} {5}", toolInvocationHint, fileTreeCountHint, elicitationHint, tableCountHint, element.response.toString(), accessibleViewHint)
+					: localize('noCodeBlocks', "{0}{1}{2} {3}", fileTreeCountHint, elicitationHint, tableCountHint, element.response.toString());
 				break;
 			case 1:
-				label = accessibleViewHint ? localize('singleCodeBlockHint', "{0}{1}1 code block: {2} {3}{4}", toolInvocationHint, fileTreeCountHint, tableCountHint, element.response.toString(), accessibleViewHint) : localize('singleCodeBlock', "{0} 1 code block: {1}", fileTreeCountHint, element.response.toString());
+				label = accessibleViewHint
+					? localize('singleCodeBlockHint', "{0}{1}{2}1 code block: {3} {4}{5}", toolInvocationHint, fileTreeCountHint, elicitationHint, tableCountHint, element.response.toString(), accessibleViewHint)
+					: localize('singleCodeBlock', "{0}{1}1 code block: {2} {3}", fileTreeCountHint, elicitationHint, tableCountHint, element.response.toString());
 				break;
 			default:
-				label = accessibleViewHint ? localize('multiCodeBlockHint', "{0}{1}{2} code blocks: {3}{4}", toolInvocationHint, fileTreeCountHint, tableCountHint, codeBlockCount, element.response.toString(), accessibleViewHint) : localize('multiCodeBlock', "{0} {1} code blocks", fileTreeCountHint, codeBlockCount, element.response.toString());
+				label = accessibleViewHint
+					? localize('multiCodeBlockHint', "{0}{1}{2}{3} code blocks: {4}{5} {6}", toolInvocationHint, fileTreeCountHint, elicitationHint, tableCountHint, codeBlockCount, element.response.toString(), accessibleViewHint)
+					: localize('multiCodeBlock', "{0}{1}{2} code blocks: {3} {4}", fileTreeCountHint, elicitationHint, codeBlockCount, tableCountHint, element.response.toString());
 				break;
 		}
 		return label;
diff --git a/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts b/src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { alert, status } from '../../../../base/browser/ui/aria/aria.js';
 import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -14,6 +14,7 @@ import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js'
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { AccessibilityVoiceSettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IChatElicitationRequest } from '../common/chatService.js';
 
 const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 export class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
@@ -51,4 +52,10 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 			status(plainTextResponse + errorDetails);
 		}
 	}
+	acceptElicitation(elicitation: IChatElicitationRequest): void {
+		const title = typeof elicitation.title === 'string' ? elicitation.title : elicitation.title.value;
+		const message = typeof elicitation.message === 'string' ? elicitation.message : elicitation.message.value;
+		alert(title + ' ' + message);
+		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatUserActionRequired, { allowManyInParallel: true });
+	}
 }
diff --git a/src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts b/src/vs/workbench/contrib/chat/browser/chatContentParts/chatElicitationContentPart.ts
@@ -9,6 +9,7 @@ import { Disposable, IDisposable } from '../../../../../base/common/lifecycle.js
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IChatProgressRenderableResponseContent } from '../../common/chatModel.js';
 import { IChatElicitationRequest } from '../../common/chatService.js';
+import { IChatAccessibilityService } from '../chat.js';
 import { ChatConfirmationWidget } from './chatConfirmationWidget.js';
 import { IChatContentPart, IChatContentPartRenderContext } from './chatContentParts.js';
 
@@ -22,6 +23,7 @@ export class ChatElicitationContentPart extends Disposable implements IChatConte
 		elicitation: IChatElicitationRequest,
 		context: IChatContentPartRenderContext,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IChatAccessibilityService private readonly chatAccessibilityService: IChatAccessibilityService
 	) {
 		super();
 
@@ -36,6 +38,8 @@ export class ChatElicitationContentPart extends Disposable implements IChatConte
 
 		this._register(confirmationWidget.onDidChangeHeight(() => this._onDidChangeHeight.fire()));
 
+		const messageToRender = this.getMessageToRender(elicitation);
+
 		this._register(confirmationWidget.onDidClick(async e => {
 			if (e.data) {
 				await elicitation.accept();
@@ -44,12 +48,16 @@ export class ChatElicitationContentPart extends Disposable implements IChatConte
 			}
 
 			confirmationWidget.setShowButtons(false);
-			confirmationWidget.updateMessage(this.getMessageToRender(elicitation));
+			confirmationWidget.updateMessage(messageToRender);
 
 			this._onDidChangeHeight.fire();
 		}));
 
+
+		this.chatAccessibilityService.acceptElicitation(elicitation);
 		this.domNode = confirmationWidget.domNode;
+		this.domNode.tabIndex = 0;
+		this.domNode.ariaLabel = elicitation.title + ' ' + (typeof messageToRender === 'string' ? messageToRender : messageToRender.value || '');
 	}
 
 	private getMessageToRender(elicitation: IChatElicitationRequest): IMarkdownString | string {
diff --git a/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts b/src/vs/workbench/contrib/chat/browser/chatResponseAccessibleView.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { renderAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
-import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { isMarkdownString, MarkdownString } from '../../../../base/common/htmlContent.js';
 import { stripIcons } from '../../../../base/common/iconLabels.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { AccessibleViewProviderId, AccessibleViewType, IAccessibleViewContentProvider } from '../../../../platform/accessibility/browser/accessibleView.js';
@@ -66,7 +66,20 @@ class ChatResponseAccessibleProvider extends Disposable implements IAccessibleVi
 			responseContent = item.errorDetails.message;
 		}
 		if (isResponseVM(item)) {
-
+			item.response.value.filter(item => item.kind === 'elicitation').forEach(elicitation => {
+				const title = elicitation.title;
+				if (typeof title === 'string') {
+					responseContent += `${title}\n`;
+				} else if (isMarkdownString(title)) {
+					responseContent += renderAsPlaintext(title, { includeCodeBlocksFences: true }) + '\n';
+				}
+				const message = elicitation.message;
+				if (isMarkdownString(message)) {
+					responseContent += renderAsPlaintext(message, { includeCodeBlocksFences: true });
+				} else {
+					responseContent += message;
+				}
+			});
 			const toolInvocations = item.response.value.filter(item => item.kind === 'toolInvocation');
 			for (const toolInvocation of toolInvocations) {
 				if (toolInvocation.confirmationMessages) {
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts
@@ -186,6 +186,7 @@ suite('InlineChatController', function () {
 			[IChatAccessibilityService, new class extends mock<IChatAccessibilityService>() {
 				override acceptResponse(response: IChatResponseViewModel | undefined, requestId: number): void { }
 				override acceptRequest(): number { return -1; }
+				override acceptElicitation(): void { }
 			}],
 			[IAccessibleViewService, new class extends mock<IAccessibleViewService>() {
 				override getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | null {
diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatSession.test.ts
@@ -117,6 +117,7 @@ suite('InlineChatSession', function () {
 			[IChatAccessibilityService, new class extends mock<IChatAccessibilityService>() {
 				override acceptResponse(response: IChatResponseViewModel | undefined, requestId: number): void { }
 				override acceptRequest(): number { return -1; }
+				override acceptElicitation(): void { }
 			}],
 			[IAccessibleViewService, new class extends mock<IAccessibleViewService>() {
 				override getOpenAriaHint(verbositySettingKey: AccessibilityVerbositySettingId): string | null {
diff --git a/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.ts
@@ -230,6 +230,7 @@ export class SCMRepositoriesViewPane extends ViewPane {
 
 		this._register(this.tree.onDidChangeSelection(this.onTreeSelectionChange, this));
 		this._register(this.tree.onDidChangeFocus(this.onTreeDidChangeFocus, this));
+		this._register(this.tree.onDidFocus(this.onDidTreeFocus, this));
 		this._register(this.tree.onContextMenu(this.onTreeContextMenu, this));
 		this._register(this.tree.onDidChangeContentHeight(this.onTreeContentHeightChange, this));
 	}
@@ -274,6 +275,13 @@ export class SCMRepositoriesViewPane extends ViewPane {
 		}
 	}
 
+	private onDidTreeFocus(): void {
+		const focused = this.tree.getFocus();
+		if (focused.length > 0) {
+			this.scmViewService.focus(focused[0]);
+		}
+	}
+
 	private onTreeContentHeightChange(height: number): void {
 		this.updateBodySize(height);
 
diff --git a/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalTool.ts b/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalTool.ts
@@ -399,7 +399,7 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
 				this._logService.debug(`RunInTerminalTool: Using \`${strategy.type}\` execute strategy for command \`${command}\``);
 				const executeResult = await strategy.execute(command, token);
 				this._logService.debug(`RunInTerminalTool: Finished \`${strategy.type}\` execute strategy with exitCode \`${executeResult.exitCode}\`, result.length \`${executeResult.output?.length}\`, error \`${executeResult.error}\``);
-				outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output, '\n') + 1;
+				outputLineCount = executeResult.output === undefined ? 0 : count(executeResult.output.trim(), '\n') + 1;
 				exitCode = executeResult.exitCode;
 				error = executeResult.error;
 

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,8 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {`
`33`	`33`	`return undefined;`
`34`	`34`	`}`
`35`	`35`
`36`		`- const enableExpandableHover = vscode.workspace.getConfiguration('typescript').get<boolean>('experimental.expandableHover', true);`
`37`	`36`	`let verbosityLevel: number \| undefined;`
`38`		`- if (enableExpandableHover && this.client.apiVersion.gte(API.v590)) {`
	`37`	`+ if (this.client.apiVersion.gte(API.v590)) {`
`39`	`38`	`verbosityLevel = Math.max(0, this.getPreviousLevel(context?.previousHover) + (context?.verbosityDelta ?? 0));`
`40`	`39`	`}`
`41`	`40`	`const args = { ...typeConverters.Position.toFileLocationRequestArgs(filepath, position), verbosityLevel };`