edits: move edit confirmations to extension tools (microsoft#262196)

Goes with microsoft/vscode-copilot-chat#646

Author: connor4312

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

@@ -44,7 +44,7 @@ import { ChatTodoListService, IChatTodoListService } from '../common/chatTodoLis
 import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
 import { IChatVariablesService } from '../common/chatVariables.js';
 import { ChatWidgetHistoryService, IChatWidgetHistoryService } from '../common/chatWidgetHistoryService.js';
-import { ChatAgentLocation, chatAutoApproveEditsDefaultConfiguration, ChatConfiguration, ChatModeKind } from '../common/constants.js';
+import { ChatAgentLocation, ChatConfiguration, ChatModeKind } from '../common/constants.js';
 import { ILanguageModelIgnoredFilesService, LanguageModelIgnoredFilesService } from '../common/ignoredFiles.js';
 import { ILanguageModelsService, LanguageModelsService } from '../common/languageModels.js';
 import { ILanguageModelStatsService, LanguageModelStatsService } from '../common/languageModelStats.js';
@@ -236,7 +236,10 @@ configurationRegistry.registerConfiguration({
 			}
 		},
 		[ChatConfiguration.AutoApproveEdits]: {
-			default: chatAutoApproveEditsDefaultConfiguration,
+			default: {
+				'**/*': true,
+				'**/.vscode/*.json': false,
+			},
 			markdownDescription: nls.localize('chat.tools.autoApprove.edits', "Controls whether edits made by chat are automatically approved. The default is to approve all edits except those made to certain files which have the potential to cause immediate unintened side-effects, such as `**/.vscode/*.json`.\n\nFiles are matched against the glob patterns in the order they are specified."),
 			type: 'object',
 			additionalProperties: {

src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.ts

@@ -385,8 +385,6 @@ class CollapsibleListRenderer implements IListRenderer<IChatCollapsibleListItem,
 					range: 'range' in reference ? reference.range : undefined,
 					title: data.options?.status?.description ?? data.title,
 					strikethrough: data.excluded,
-					icon: ThemeIcon.isThemeIcon(data.iconPath) ? data.iconPath : undefined,
-					descriptionTitle: data.description,
 					extraClasses
 				});
 			}

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry.ts

@@ -223,8 +223,7 @@ export class ChatEditingModifiedDocumentEntry extends AbstractChatEditingModifie
 				this._rewriteRatioObs.set(1, tx);
 			}
 		});
-
-		if (isLastEdits && !this.editsRequireManualApproval.get()) {
+		if (isLastEdits) {
 			await this._textFileService.save(this.modifiedModel.uri, {
 				reason: SaveReason.AUTO,
 				skipSaveParticipants: true,

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedFileEntry.ts

@@ -5,7 +5,6 @@
 
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Emitter } from '../../../../../base/common/event.js';
-import * as glob from '../../../../../base/common/glob.js';
 import { Disposable, DisposableMap, MutableDisposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
 import { clamp } from '../../../../../base/common/numbers.js';
@@ -25,7 +24,6 @@ import { ICellEditOperation } from '../../../notebook/common/notebookCommon.js';
 import { ChatEditKind, IModifiedEntryTelemetryInfo, IModifiedFileEntry, IModifiedFileEntryEditorIntegration, ISnapshotEntry, ModifiedFileEntryState } from '../../common/chatEditingService.js';
 import { IChatResponseModel } from '../../common/chatModel.js';
 import { ChatUserAction, IChatService } from '../../common/chatService.js';
-import { chatAutoApproveEditsDefaultConfiguration, ChatConfiguration } from '../../common/constants.js';
 
 class AutoAcceptControl {
 	constructor(
@@ -76,8 +74,6 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 	private readonly _autoAcceptCtrl = observableValue<AutoAcceptControl | undefined>(this, undefined);
 	readonly autoAcceptController: IObservable<AutoAcceptControl | undefined> = this._autoAcceptCtrl;
 
-	readonly editsRequireManualApproval: IObservable<boolean>;
-
 	protected readonly _autoAcceptTimeout: IObservable<number>;
 
 	get telemetryInfo(): IModifiedEntryTelemetryInfo {
@@ -122,20 +118,6 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 			}));
 		}
 
-		const autoApproveConfig = observableConfigValue(ChatConfiguration.AutoApproveEdits, chatAutoApproveEditsDefaultConfiguration, configService);
-		this.editsRequireManualApproval = autoApproveConfig.map(config => {
-			let autoApprove = true;
-			for (const [pattern, value] of Object.entries(config)) {
-				if (value === autoApprove) {
-					continue; // would not change match anyway
-				}
-				if (glob.match(pattern, this.modifiedURI.fsPath)) {
-					autoApprove = value;
-				}
-			}
-			return !autoApprove;
-		});
-
 		// review mode depends on setting and temporary override
 		const autoAcceptRaw = observableConfigValue('chat.editing.autoAcceptDelay', 0, configService);
 		this._autoAcceptTimeout = derived(r => {
@@ -152,7 +134,7 @@ export abstract class AbstractChatEditingModifiedFileEntry extends Disposable im
 
 		const autoSaveOff = this._store.add(new MutableDisposable());
 		this._store.add(autorun(r => {
-			if (this._waitsForLastEdits.read(r) || (this.state.read(r) === ModifiedFileEntryState.Modified && this.editsRequireManualApproval.read(r))) {
+			if (this._waitsForLastEdits.read(r)) {
 				autoSaveOff.value = _fileConfigService.disableAutoSave(this.modifiedURI);
 			} else {
 				autoSaveOff.clear();

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

@@ -330,8 +330,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 	private readonly _chatEditsActionsDisposables: DisposableStore;
 	private readonly _chatEditsDisposables: DisposableStore;
-	private _chatEditsContainer?: HTMLElement;
-	private _chatEditsApprovalContainer?: HTMLElement;
 	private _chatEditsListPool: CollapsibleListPool;
 	private _chatEditList: IDisposableReference<WorkbenchList<IChatCollapsibleListItem>> | undefined;
 	get selectedElements(): URI[] {
@@ -1524,7 +1522,6 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 		const seenEntries = new ResourceSet();
 		const entries: IChatCollapsibleListItem[] = [];
-		let manualApprovalNeeded = false;
 		if (chatEditingSession) {
 			for (const entry of chatEditingSession.entries.get()) {
 				if (entry.state.get() !== ModifiedFileEntryState.Modified) {
@@ -1533,19 +1530,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 
 				if (!seenEntries.has(entry.modifiedURI)) {
 					seenEntries.add(entry.modifiedURI);
-					const item: IChatCollapsibleListItem = {
+					entries.push({
 						reference: entry.modifiedURI,
 						state: entry.state.get(),
 						kind: 'reference',
-					};
-
-					if (entry.editsRequireManualApproval.get()) {
-						item.iconPath = Codicon.warning;
-						item.description = localize('chatEditingSession.fileRequiresManualApproval', 'Edits requires manual approval');
-						manualApprovalNeeded = true;
-					}
-
-					entries.push(item);
+					});
 				}
 			}
 		}
@@ -1554,21 +1543,11 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			dom.clearNode(this.chatEditingSessionWidgetContainer);
 			this._chatEditsDisposables.clear();
 			this._chatEditList = undefined;
-			this._chatEditsContainer = undefined;
-			this._chatEditsApprovalContainer = undefined;
 			return;
 		}
 
 		// Summary of number of files changed
-		const approvalNotice = (this._chatEditsApprovalContainer ??= dom.append(this.chatEditingSessionWidgetContainer, $('.chat-editing-session-approval-notice')));
-		const innerContainer = (this._chatEditsContainer ??= dom.append(this.chatEditingSessionWidgetContainer, $('.chat-editing-session-container.show-file-icons')));
-
-		if (manualApprovalNeeded) {
-			approvalNotice.style.display = 'block';
-			approvalNotice.textContent = localize('chatEditingSession.manualApprovalNeeded', 'One or more file edits require manual approval');
-		} else {
-			approvalNotice.style.display = 'none';
-		}
+		const innerContainer = this.chatEditingSessionWidgetContainer.querySelector('.chat-editing-session-container.show-file-icons') as HTMLElement ?? dom.append(this.chatEditingSessionWidgetContainer, $('.chat-editing-session-container.show-file-icons'));
 
 		entries.sort((a, b) => {
 			if (a.kind === 'reference' && b.kind === 'reference') {

src/vs/workbench/contrib/chat/browser/media/chat.css

@@ -724,13 +724,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	display: inherit;
 }
 
-.interactive-session .chat-editing-session .chat-editing-session-approval-notice {
-	font-size: 12px;
-	padding: 4px 8px;
-	color: var(--vscode-list-warningForeground);
-	text-align: center;
-}
-
 .interactive-session .chat-editing-session .chat-editing-session-container.show-file-icons .monaco-scrollable-element .monaco-list-rows .monaco-list-row {
 	border-radius: 2px;
 }
@@ -1774,10 +1767,6 @@ have to be updated for changes to the rules above, or to support more deeply nes
 		padding: 0px 3px;
 	}
 
-	.monaco-icon-label.codicon-warning::before {
-		color: var(--vscode-list-warningForeground);
-	}
-
 	.monaco-icon-label.excluded {
 		color: var(--vscode-notificationsWarningIcon-foreground)
 	}

src/vs/workbench/contrib/chat/common/chatEditingService.ts

@@ -238,7 +238,6 @@ export interface IModifiedFileEntry {
 	readonly lastModifyingRequestId: string;
 
 	readonly state: IObservable<ModifiedFileEntryState>;
-	readonly editsRequireManualApproval: IObservable<boolean>;
 	readonly isCurrentlyBeingModifiedBy: IObservable<IChatResponseModel | undefined>;
 	readonly lastModifyingResponse: IObservable<IChatResponseModel | undefined>;
 	readonly rewriteRatio: IObservable<number>;

src/vs/workbench/contrib/chat/common/constants.ts

@@ -60,8 +60,3 @@ export namespace ChatAgentLocation {
 		return ChatAgentLocation.Panel;
 	}
 }
-
-export const chatAutoApproveEditsDefaultConfiguration = {
-	'**/*': true,
-	'**/.vscode/*.json': false,
-};