AutoApprove edits in CLI when using autoapprove mode (#4373)

* AutoApprove edits in CLI when using autoapprove mode

* Fix tests

* Add more tests

* UpdatesFixes

Author: DonJayamanne

src/extension/chatSessions/copilotcli/node/copilotcliSession.ts

@@ -371,7 +371,7 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 					confirmationType: 'basic' as const,
 				};
 
-				let approved = false;
+				let approved = true;
 				try {
 					const result = await this._toolsService.invokeTool(ToolName.CoreConfirmationTool, {
 						input: params,
@@ -380,12 +380,15 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
 
 					const firstResultPart = result.content.at(0);
 					approved = firstResultPart instanceof LanguageModelTextPart && firstResultPart.value === 'yes';
+					const autoApproveEdits = approved && this._permissionLevel === 'autoApprove' ? true : undefined;
+					if (approved) {
+						this._sdkSession.respondToExitPlanMode(event.data.requestId, { approved, selectedAction: 'exit_only', autoApproveEdits });
+						return;
+					}
 				} catch (error) {
 					this.logService.error(error, '[ConfirmationTool] Error showing confirmation tool for exit plan mode');
-					approved = false;
 				}
-
-				this._sdkSession.respondToExitPlanMode(event.data.requestId, { approved, selectedAction: 'exit_only' });
+				this._sdkSession.respondToExitPlanMode(event.data.requestId, { approved: false });
 
 			})));
 			disposables.add(toDisposable(this._sdkSession.on('user_input.requested', async (event) => {

src/extension/chatSessions/copilotcli/node/test/copilotcliSession.spec.ts

@@ -1185,6 +1185,36 @@ describe('CopilotCLISession', () => {
 			expect(toolsService.invokeToolCalls[0].input).toMatchObject({ message: summary });
 		});
 
+		it('sets autoApproveEdits when user confirms with autoApprove permission level', async () => {
+			const result = { value: undefined as unknown };
+			setupSendWithExitPlanMode({ summary: 'Here is the plan', actions: ['exit_only'] }, result);
+			toolsService.setConfirmationResult('yes');
+			const session = await createSession();
+			session.setPermissionLevel('autoApprove');
+			const stream = new MockChatResponseStream();
+			session.attachStream(stream);
+			const mockToken = {} as ChatParticipantToolToken;
+
+			await session.handleRequest({ id: '', toolInvocationToken: mockToken }, { prompt: 'Plan' }, [], undefined, authInfo, CancellationToken.None);
+
+			expect(result.value).toEqual({ approved: true, selectedAction: 'exit_only', autoApproveEdits: true });
+		});
+
+		it('does not set autoApproveEdits when user rejects with autoApprove permission level', async () => {
+			const result = { value: undefined as unknown };
+			setupSendWithExitPlanMode({ summary: 'Here is the plan', actions: ['exit_only'] }, result);
+			toolsService.setConfirmationResult('no');
+			const session = await createSession();
+			session.setPermissionLevel('autoApprove');
+			const stream = new MockChatResponseStream();
+			session.attachStream(stream);
+			const mockToken = {} as ChatParticipantToolToken;
+
+			await session.handleRequest({ id: '', toolInvocationToken: mockToken }, { prompt: 'Plan' }, [], undefined, authInfo, CancellationToken.None);
+
+			expect(result.value).toEqual({ approved: false });
+		});
+
 		it('denies when user rejects via confirmation tool in non-autopilot mode', async () => {
 			const result = { value: undefined as unknown };
 			setupSendWithExitPlanMode({ summary: 'Here is the plan', actions: ['exit_only'] }, result);
@@ -1196,7 +1226,7 @@ describe('CopilotCLISession', () => {
 
 			await session.handleRequest({ id: '', toolInvocationToken: mockToken }, { prompt: 'Plan' }, [], undefined, authInfo, CancellationToken.None);
 
-			expect(result.value).toEqual({ approved: false, selectedAction: 'exit_only' });
+			expect(result.value).toEqual({ approved: false });
 		});
 
 		it('denies when confirmation tool throws in non-autopilot mode', async () => {
@@ -1210,7 +1240,7 @@ describe('CopilotCLISession', () => {
 
 			await session.handleRequest({ id: '', toolInvocationToken: mockToken }, { prompt: 'Plan' }, [], undefined, authInfo, CancellationToken.None);
 
-			expect(result.value).toEqual({ approved: false, selectedAction: 'exit_only' });
+			expect(result.value).toEqual({ approved: false });
 		});
 	});
 });