fix: show errors for non-LanguageModelError exceptions, extract family name helper, defer provider creation

Author: rbonestell

src/__tests__/providers/lmApiProvider.test.ts

@@ -139,7 +139,7 @@ describe('LmApiProvider', () => {
             );
         });
 
-        it('returns undefined for non-LanguageModelError exceptions', async () => {
+        it('shows generic error for non-LanguageModelError exceptions', async () => {
             const model = createMockModel({
                 sendRequest: jest.fn().mockRejectedValue(new Error('network error')),
             });
@@ -150,6 +150,9 @@ describe('LmApiProvider', () => {
 
             const result = await provider.generateMessage('inst', 'ctx', token);
             expect(result).toBeUndefined();
+            expect(vscode.window.showErrorMessage).toHaveBeenCalledWith(
+                'Unexpected error: network error'
+            );
         });
     });
 

src/generateCommitMessage.ts

@@ -15,7 +15,6 @@ export async function generateCommitMessage(
 
     const repoRoot = repo.rootUri.fsPath;
     const settings = getSettings();
-    const provider = createProvider(repoRoot);
 
     const [diffResult, logResult] = await Promise.allSettled([
         repo.diff(true),
@@ -41,6 +40,8 @@ export async function generateCommitMessage(
         ? formatCommitLog(logResult.value)
         : '';
 
+    const provider = createProvider(repoRoot);
+
     const message = await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,

src/providers/lmApiProvider.ts

@@ -33,25 +33,31 @@ export class LmApiProvider implements CommitMessageProvider {
             }
             return chunks.join('');
         } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
             if (err instanceof vscode.LanguageModelError) {
-                vscode.window.showErrorMessage(`Claude request failed: ${err.message}`);
+                vscode.window.showErrorMessage(`Claude request failed: ${message}`);
+            } else {
+                vscode.window.showErrorMessage(`Unexpected error: ${message}`);
             }
             return undefined;
         }
     }
 
+    private toFamilyName(model: string): string {
+        return `claude-${model}`;
+    }
+
     private async selectModel(preferredModel?: string): Promise<vscode.LanguageModelChat | undefined> {
         if (preferredModel) {
-            const familyName = `claude-${preferredModel}`;
-            const exact = await vscode.lm.selectChatModels({ vendor: 'anthropic', family: familyName });
+            const exact = await vscode.lm.selectChatModels({ vendor: 'anthropic', family: this.toFamilyName(preferredModel) });
             if (exact.length > 0) { return exact[0]; }
         }
 
         const anyAnthropic = await vscode.lm.selectChatModels({ vendor: 'anthropic' });
         if (anyAnthropic.length > 0) { return anyAnthropic[0]; }
 
         if (preferredModel) {
-            const byFamily = await vscode.lm.selectChatModels({ family: `claude-${preferredModel}` });
+            const byFamily = await vscode.lm.selectChatModels({ family: this.toFamilyName(preferredModel) });
             if (byFamily.length > 0) { return byFamily[0]; }
         }