No-ops on AI commands when user cancels

Author: axosoft-ramint

src/commands/explainBranch.ts

@@ -114,6 +114,8 @@ export class ExplainBranchCommand extends ExplainCommandBase {
 				},
 			);
 
+			if (result === 'cancelled') return;
+
 			if (result == null) {
 				void showGenericErrorMessage(`Unable to explain branch ${branch.name}`);
 				return;

src/commands/explainCommit.ts

@@ -90,6 +90,8 @@ export class ExplainCommitCommand extends ExplainCommandBase {
 				},
 			);
 
+			if (result === 'cancelled') return;
+
 			if (result == null) {
 				void showGenericErrorMessage('Unable to explain commit');
 				return;

src/commands/explainStash.ts

@@ -76,6 +76,8 @@ export class ExplainStashCommand extends ExplainCommandBase {
 				},
 			);
 
+			if (result === 'cancelled') return;
+
 			if (result == null) {
 				void showGenericErrorMessage('No changes found to explain for stash');
 				return;

src/commands/explainWip.ts

@@ -112,6 +112,8 @@ export class ExplainWipCommand extends ExplainCommandBase {
 				},
 			);
 
+			if (result === 'cancelled') return;
+
 			if (result == null) {
 				void showGenericErrorMessage(`Unable to explain ${label} changes`);
 				return;

src/commands/generateChangelog.ts

@@ -95,6 +95,8 @@ export async function generateChangelogAndOpenMarkdownDocument(
 ): Promise<void> {
 	const result = await container.ai.generateChangelog(changes, source, options);
 
+	if (result === 'cancelled') return;
+
 	const { range, changes: { length: count } = [] } = await changes.value;
 
 	let content = `# Changelog for ${range.head.label ?? range.head.ref}\n`;

src/commands/generateCommitMessage.ts

@@ -74,6 +74,8 @@ export class GenerateCommitMessageCommand extends ActiveEditorCommand {
 					progress: { location: ProgressLocation.Notification, title: 'Generating commit message...' },
 				},
 			);
+			if (result === 'cancelled') return;
+
 			if (result == null) return;
 
 			void executeCoreCommand('workbench.view.scm');

src/commands/generateRebase.ts

@@ -171,6 +171,8 @@ export async function generateRebase(
 
 	const repo = svc.getRepository()!;
 	const result = await container.ai.generateRebase(repo, base.ref, head.ref, source, aiOptions);
+	if (result === 'cancelled') return;
+
 	if (result == null) return;
 
 	try {

src/commands/git/stash.ts

@@ -677,6 +677,8 @@ export class StashGitCommand extends QuickCommand<State> {
 						resume?.dispose();
 						input.validationMessage = undefined;
 
+						if (result === 'cancelled') return;
+
 						const message = result?.parsed.summary;
 						if (message != null) {
 							state.message = message;

src/env/node/git/commitMessageProvider.ts

@@ -62,7 +62,10 @@ class AICommitMessageProvider implements CommitMessageProvider, Disposable {
 				},
 			);
 
+			if (result === 'cancelled') return;
+
 			if (result == null) return;
+
 			return `${currentMessage ? `${currentMessage}\n\n` : ''}${result.parsed.summary}${
 				result.parsed.body ? `\n\n${result.parsed.body}` : ''
 			}`;

src/git/utils/-webview/pullRequest.utils.ts

@@ -39,6 +39,8 @@ export async function describePullRequestWithAI(
 				...options,
 			},
 		);
+		if (result === 'cancelled') return undefined;
+
 		return result?.parsed ? { title: result.parsed.summary, description: result.parsed.body } : undefined;
 	} catch (ex) {
 		void window.showErrorMessage(ex.message);