From 099f603dfe79dd7cc00e323ec6cbefb4e98053fa Mon Sep 17 00:00:00 2001
From: Bhavya U <bhavyau@microsoft.com>
Date: Thu, 13 Nov 2025 11:00:07 -0800
Subject: [PATCH] fix: handle invalid API key error and retry fetching models
 (#1984)

---
 .../byok/vscode-node/anthropicProvider.ts       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/extensions/copilot/src/extension/byok/vscode-node/anthropicProvider.ts b/extensions/copilot/src/extension/byok/vscode-node/anthropicProvider.ts
index 49d3b9a0846..d921b34cbe8 100644
--- a/extensions/copilot/src/extension/byok/vscode-node/anthropicProvider.ts
+++ b/extensions/copilot/src/extension/byok/vscode-node/anthropicProvider.ts
@@ -157,7 +157,20 @@ export class AnthropicLMProvider implements BYOKModelProvider<LanguageModelChatI
 					return [];
 				}
 			}
-		} catch {
+		} catch (error) {
+			if (error instanceof Error && error.message.includes('invalid x-api-key')) {
+				if (options.silent) {
+					return [];
+				}
+				await this.updateAPIKey();
+				if (this._apiKey) {
+					try {
+						return byokKnownModelsToAPIInfo(AnthropicLMProvider.providerName, await this.getAllModels(this._apiKey));
+					} catch (retryError) {
+						this._logService.error(`Error after re-prompting for API key: ${toErrorMessage(retryError, true)}`);
+					}
+				}
+			}
 			return [];
 		}
 	}
@@ -374,7 +387,7 @@ export class AnthropicLMProvider implements BYOKModelProvider<LanguageModelChatI
 
 		const stream = await this._anthropicAPIClient.beta.messages.create({
 			...params,
-			betas
+			...(betas.length > 0 && { betas })
 		});
 
 		let pendingToolCall: {