Merge remote-tracking branch 'origin/main' into tyriar/260573_3

Author: Tyriar

extensions/git/src/commands.ts

@@ -3457,7 +3457,7 @@ export class CommandCenter {
 			return [createBranch, { label: '', kind: QuickPickItemKind.Separator }, ...branchItems];
 		};
 
-		const placeHolder = l10n.t('Select a branch to create the new worktree from');
+		const placeHolder = l10n.t('Select a branch or tag to create the new worktree from');
 		const choice = await this.pickRef(getBranchPicks(), placeHolder);
 
 		if (!choice) {

extensions/html-language-features/package-lock.json

@@ -20,7 +20,7 @@ declare global {
 
 	// --- timeout / interval (available in all contexts, but different signatures in node.js vs web)
 
-	interface TimeoutHandle {readonly _: never; /* this is a trick that seems needed to prevent direct number assignment */}
+	interface TimeoutHandle { readonly _: never; /* this is a trick that seems needed to prevent direct number assignment */ }
 	type Timeout = TimeoutHandle;
 	function setTimeout(handler: string | Function, timeout?: number, ...arguments: any[]): Timeout;
 	function clearTimeout(timeout: Timeout | undefined): void;

src/typings/base-common.d.ts

@@ -736,14 +736,14 @@ export async function fetchDynamicRegistration(serverMetadata: IAuthorizationSer
 			redirect_uris: [
 				'https://insiders.vscode.dev/redirect',
 				'https://vscode.dev/redirect',
-				'http://localhost',
-				'http://127.0.0.1',
+				'http://localhost/',
+				'http://127.0.0.1/',
 				// Added these for any server that might do
 				// only exact match on the redirect URI even
 				// though the spec says it should not care
 				// about the port.
-				`http://localhost:${DEFAULT_AUTH_FLOW_PORT}`,
-				`http://127.0.0.1:${DEFAULT_AUTH_FLOW_PORT}`
+				`http://localhost:${DEFAULT_AUTH_FLOW_PORT}/`,
+				`http://127.0.0.1:${DEFAULT_AUTH_FLOW_PORT}/`
 			],
 			scope: scopes?.join(AUTH_SCOPE_SEPARATOR),
 			token_endpoint_auth_method: 'none',

src/vs/base/common/oauth.ts

@@ -358,10 +358,10 @@ suite('OAuth', () => {
 			assert.deepStrictEqual(requestBody.redirect_uris, [
 				'https://insiders.vscode.dev/redirect',
 				'https://vscode.dev/redirect',
-				'http://localhost',
-				'http://127.0.0.1',
-				`http://localhost:${DEFAULT_AUTH_FLOW_PORT}`,
-				`http://127.0.0.1:${DEFAULT_AUTH_FLOW_PORT}`
+				'http://localhost/',
+				'http://127.0.0.1/',
+				`http://localhost:${DEFAULT_AUTH_FLOW_PORT}/`,
+				`http://127.0.0.1:${DEFAULT_AUTH_FLOW_PORT}/`
 			]);
 
 			// Verify response is processed correctly

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

@@ -546,7 +546,9 @@ export class QuickInputController extends Disposable {
 			input.ignoreFocusOut = !!options.ignoreFocusLost;
 			input.matchOnDescription = !!options.matchOnDescription;
 			input.matchOnDetail = !!options.matchOnDetail;
-			input.sortByLabel = !!options.sortByLabel;
+			if (options.sortByLabel !== undefined) {
+				input.sortByLabel = options.sortByLabel;
+			}
 			input.matchOnLabel = (options.matchOnLabel === undefined) || options.matchOnLabel; // default to true
 			input.quickNavigate = options.quickNavigate;
 			input.hideInput = !!options.hideInput;

src/vs/platform/quickinput/browser/quickInputController.ts

@@ -6,7 +6,7 @@
 import { raceCancellationError } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, DisposableStore, IDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import { localize } from '../../../nls.js';
@@ -27,8 +27,11 @@ import { ExtHostChatSessionsShape, ExtHostContext, IChatProgressDto, MainContext
 
 @extHostNamedCustomer(MainContext.MainThreadChatSessions)
 export class MainThreadChatSessions extends Disposable implements MainThreadChatSessionsShape {
-	private readonly _itemProvidersRegistrations = this._register(new DisposableMap<number>());
-	private readonly _contentProvidersRegisterations = this._register(new DisposableMap<number>());
+	private readonly _itemProvidersRegistrations = this._register(new DisposableMap<number, IDisposable & {
+		readonly provider: IChatSessionItemProvider;
+		readonly onDidChangeItems: Emitter<void>;
+	}>());
+	private readonly _contentProvidersRegistrations = this._register(new DisposableMap<number>());
 
 	// Store progress emitters for active sessions: key is `${handle}_${sessionId}_${requestId}`
 	private readonly _activeProgressEmitters = new Map<string, Emitter<IChatProgress[]>>();
@@ -56,17 +59,25 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 	$registerChatSessionItemProvider(handle: number, chatSessionType: string): void {
 		// Register the provider handle - this tracks that a provider exists
+		const disposables = new DisposableStore();
+		const changeEmitter = disposables.add(new Emitter<void>());
+
 		const provider: IChatSessionItemProvider = {
 			chatSessionType,
+			onDidChangeChatSessionItems: changeEmitter.event,
 			provideChatSessionItems: (token) => this._provideChatSessionItems(handle, token)
 		};
+		disposables.add(this._chatSessionsService.registerChatSessionItemProvider(provider));
 
-		this._itemProvidersRegistrations.set(handle, this._chatSessionsService.registerChatSessionItemProvider(provider));
+		this._itemProvidersRegistrations.set(handle, {
+			dispose: () => disposables.dispose(),
+			provider,
+			onDidChangeItems: changeEmitter,
+		});
 	}
 
-	$onDidChangeChatSessionItems(chatSessionType: string): void {
-		// Notify the provider that its chat session items have changed
-		this._chatSessionsService.notifySessionItemsChange(chatSessionType);
+	$onDidChangeChatSessionItems(handle: number): void {
+		this._itemProvidersRegistrations.get(handle)?.onDidChangeItems.fire();
 	}
 
 	private async _provideChatSessionItems(handle: number, token: CancellationToken): Promise<IChatSessionItem[]> {
@@ -171,15 +182,14 @@ export class MainThreadChatSessions extends Disposable implements MainThreadChat
 
 	$registerChatSessionContentProvider(handle: number, chatSessionType: string): void {
 		const provider: IChatSessionContentProvider = {
-			chatSessionType,
 			provideChatSessionContent: (id, token) => this._provideChatSessionContent(handle, id, token)
 		};
 
-		this._contentProvidersRegisterations.set(handle, this._chatSessionsService.registerChatSessionContentProvider(provider));
+		this._contentProvidersRegistrations.set(handle, this._chatSessionsService.registerChatSessionContentProvider(chatSessionType, provider));
 	}
 
 	$unregisterChatSessionContentProvider(handle: number): void {
-		this._contentProvidersRegisterations.deleteAndDispose(handle);
+		this._contentProvidersRegistrations.deleteAndDispose(handle);
 	}
 
 	async $handleProgressChunk(handle: number, sessionId: string, requestId: string, chunks: (IChatProgressDto | [IChatProgressDto, number])[]): Promise<void> {

src/vs/workbench/api/browser/mainThreadChatSessions.ts

@@ -3137,7 +3137,7 @@ export interface ChatSessionDto {
 export interface MainThreadChatSessionsShape extends IDisposable {
 	$registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
 	$unregisterChatSessionItemProvider(handle: number): void;
-	$onDidChangeChatSessionItems(chatSessionType: string): void;
+	$onDidChangeChatSessionItems(handle: number): void;
 
 	$registerChatSessionContentProvider(handle: number, chatSessionType: string): void;
 	$unregisterChatSessionContentProvider(handle: number): void;

src/vs/workbench/api/common/extHost.protocol.ts

@@ -46,14 +46,22 @@ class ExtHostChatSession {
 }
 
 export class ExtHostChatSessions extends Disposable implements ExtHostChatSessionsShape {
+	private static _sessionHandlePool = 0;
 
 	private readonly _proxy: Proxied<MainThreadChatSessionsShape>;
-	private readonly _chatSessionItemProviders = new Map<number, { provider: vscode.ChatSessionItemProvider; extension: IExtensionDescription; disposable: DisposableStore }>();
-	private readonly _chatSessionContentProviders = new Map<number, { provider: vscode.ChatSessionContentProvider; extension: IExtensionDescription; disposable: DisposableStore }>();
+	private readonly _chatSessionItemProviders = new Map<number, {
+		readonly provider: vscode.ChatSessionItemProvider;
+		readonly extension: IExtensionDescription;
+		readonly disposable: DisposableStore;
+	}>();
+	private readonly _chatSessionContentProviders = new Map<number, {
+		readonly provider: vscode.ChatSessionContentProvider;
+		readonly extension: IExtensionDescription;
+		readonly disposable: DisposableStore;
+	}>();
 	private _nextChatSessionItemProviderHandle = 0;
 	private _nextChatSessionContentProviderHandle = 0;
-	private _sessionMap: Map<string, vscode.ChatSessionItem> = new Map();
-	private static _sessionHandlePool = 0;
+	private readonly _sessionMap: Map<string, vscode.ChatSessionItem> = new Map();
 
 	constructor(
 		private readonly commands: ExtHostCommands,
@@ -90,7 +98,7 @@ export class ExtHostChatSessions extends Disposable implements ExtHostChatSessio
 		this._proxy.$registerChatSessionItemProvider(handle, chatSessionType);
 		if (provider.onDidChangeChatSessionItems) {
 			disposables.add(provider.onDidChangeChatSessionItems(() => {
-				this._proxy.$onDidChangeChatSessionItems(chatSessionType);
+				this._proxy.$onDidChangeChatSessionItems(handle);
 			}));
 		}
 		return {

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

@@ -3336,7 +3336,9 @@ export namespace ChatAgentUserActionEvent {
 					outcome: outcomes.get(event.action.outcome) ?? types.ChatEditingSessionActionOutcome.Rejected,
 					uri: URI.revive(event.action.uri),
 					hasRemainingEdits: event.action.hasRemainingEdits,
-					lineCount: event.action.lineCount
+					lineCount: event.action.lineCount,
+					linesAdded: event.action.linesAdded,
+					linesRemoved: event.action.linesRemoved
 				}, result: ehResult
 			};
 		} else {