Fixes stash generation error handling

Author: eamodio

src/ai/anthropicProvider.ts

@@ -128,7 +128,7 @@ export class AnthropicProvider extends OpenAICompatibleProvider<typeof provider.
 				}
 				if (rsp.status === 429) {
 					throw new Error(
-						`(${this.name}:${rsp.status}) Too many requests (rate limit exceeded) or your API key is associated with an expired trial`,
+						`(${this.name}) ${rsp.status}: Too many requests (rate limit exceeded) or your API key is associated with an expired trial`,
 					);
 				}
 
@@ -148,7 +148,7 @@ export class AnthropicProvider extends OpenAICompatibleProvider<typeof provider.
 					continue;
 				}
 
-				throw new Error(`(${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText})`);
+				throw new Error(`(${this.name}) ${rsp.status}: ${json?.error?.message || rsp.statusText})`);
 			}
 
 			const data: AnthropicMessageResponse = await rsp.json();

src/ai/openAICompatibleProvider.ts

@@ -272,7 +272,7 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 		}
 		if (rsp.status === 429) {
 			throw new Error(
-				`(${this.name}:${rsp.status}) Too many requests (rate limit exceeded) or your account is out of funds`,
+				`(${this.name}) ${rsp.status}: Too many requests (rate limit exceeded) or your account is out of funds`,
 			);
 		}
 
@@ -285,7 +285,7 @@ export abstract class OpenAICompatibleProvider<T extends AIProviders> implements
 			return { retry: true, maxCodeCharacters: maxCodeCharacters - 500 };
 		}
 
-		throw new Error(`(${this.name}:${rsp.status}) ${json?.error?.message || rsp.statusText}`);
+		throw new Error(`(${this.name}) ${rsp.status}: ${json?.error?.message || rsp.statusText}`);
 	}
 
 	protected async fetchCore(

src/commands/git/stash.ts

@@ -637,6 +637,8 @@ export class StashGitCommand extends QuickCommand<State> {
 			value: state.message,
 			prompt: 'Enter stash message',
 			buttons: [QuickInputButtons.Back, generateMessageButton],
+			// Needed to clear any validation errors because of AI generation
+			validate: (_value: string | undefined): [boolean, string | undefined] => [true, undefined],
 			onDidClickButton: async (input, button) => {
 				if (button === generateMessageButton) {
 					using resume = step.freeze?.();
@@ -649,6 +651,7 @@ export class StashGitCommand extends QuickCommand<State> {
 						);
 						if (!diff?.contents) {
 							void window.showInformationMessage('No changes to generate a stash message from.');
+							return;
 						}
 
 						const generating = defer<AIModel>();
@@ -668,7 +671,7 @@ export class StashGitCommand extends QuickCommand<State> {
 
 						const result = await (
 							await this.container.ai
-						)?.generateStashMessage(diff!.contents, { source: 'quick-wizard' }, { generating: generating });
+						)?.generateStashMessage(diff.contents, { source: 'quick-wizard' }, { generating: generating });
 
 						input.validationMessage = undefined;
 
@@ -679,11 +682,11 @@ export class StashGitCommand extends QuickCommand<State> {
 						}
 					} catch (ex) {
 						Logger.error(ex, scope, 'generateStashMessage');
-						if (ex instanceof Error && ex.message.startsWith('No changes')) {
-							void window.showInformationMessage('No changes to generate a stash message from.');
-						} else {
-							void showGenericErrorMessage(ex.message);
-						}
+
+						input.validationMessage = {
+							severity: InputBoxValidationSeverity.Error,
+							message: ex.message,
+						};
 					}
 				}
 			},