Merge branch 'chatai' of https://github.com/halcyon-tech/vscode-db2i into chatai

merge

Author: ajshedivy

src/chat/chat.ts

@@ -140,24 +140,36 @@ async function streamModelResponse(
 
   stream.progress(`Using ${chosenProvider}...`);
 
-  await chatRequest(chosenProvider, messages, {}, token, stream);
+  return chatRequest(chosenProvider, messages, {}, token, stream);
 }
 
 async function selectProviderAndModel() {
   const selected = AiConfig.getModel();
   const copilotModels = await vscode.lm.selectChatModels();
-  let ollamaModels: ListResponse = {models: []};
-  
+  let ollamaModels: ListResponse = { models: [] };
+
   try {
     ollamaModels = await ollama.list();
-  } catch (e) {}
+  } catch (e) { }
 
   const provider = await vscode.window.showQuickPick(
     [
-      {kind: vscode.QuickPickItemKind.Separator, label: "Ollama Models"}, 
-      ...ollamaModels.models.map((model): ModelQuickPickItem => ({ label: model.name, family: model.name, provider: "Ollama", iconPath: new vscode.ThemeIcon("heart"), picked: model.name === selected})),
-      {kind: vscode.QuickPickItemKind.Separator, label: "GitHub Copilot Models"},
-      ...copilotModels.map((model): ModelQuickPickItem => ({ label: model.name, family: model.family, provider: "GitHub Copilot", iconPath: new vscode.ThemeIcon("copilot")})),
+      { kind: vscode.QuickPickItemKind.Separator, label: "Ollama Models" },
+      ...ollamaModels.models.map((model): ModelQuickPickItem => ({ 
+        label: model.name, 
+        family: model.name, 
+        provider: "Ollama", 
+        iconPath: new vscode.ThemeIcon("heart"), 
+        description: selected === model.name ? "Selected" : "" 
+      })),
+      { kind: vscode.QuickPickItemKind.Separator, label: "GitHub Copilot Models" },
+      ...copilotModels.map((model): ModelQuickPickItem => ({ 
+        label: model.name, 
+        family: model.family, 
+        provider: "GitHub Copilot", 
+        iconPath: new vscode.ThemeIcon("copilot"), 
+        description: selected === model.name ? "Selected" : "" 
+      })),
     ],
     {
       title: "Select the AI model",