Skip to content

Commit d59f6c0

Browse files
authored
Merge branch 'main' into bobbrow/runWithoutDebugging
2 parents 9f9dd61 + 61b53bc commit d59f6c0

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

Extension/src/LanguageServer/Providers/CopilotHoverProvider.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ export class CopilotHoverProvider implements vscode.HoverProvider {
4141
const vscodelm = getVSCodeLanguageModel();
4242
if (vscodelm) {
4343
try {
44-
const [model] = await vscodelm.selectChatModels(modelSelector);
44+
// First look for GPT-5-mini which should be available to all
45+
// users and have a 0x multiplier on paid plans.
46+
let [model] = await vscodelm.selectChatModels({ ...modelSelector, id: 'gpt-5-mini' });
47+
if (!model) {
48+
// If GPT-5-mini is not available, fall back to the first available model
49+
[model] = await vscodelm.selectChatModels(modelSelector);
50+
}
4551
if (!model) {
4652
telemetry.logLanguageServerEvent('CopilotHoverNoModelSelected', { remoteName: vscode.env.remoteName || 'local' });
4753
} else {

Extension/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4271,9 +4271,9 @@ lodash.truncate@^4.4.2:
42714271
integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
42724272

42734273
lodash@^4.17.23:
4274-
version "4.17.23"
4275-
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
4276-
integrity sha1-8ROwN4OGEDvk9okziMc9C95/LFo=
4274+
version "4.18.1"
4275+
resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
4276+
integrity sha1-/ytmwfYybVlRPeJAe/iBQ5gSdxw=
42774277

42784278
log-symbols@^4.1.0:
42794279
version "4.1.0"

ExtensionPack/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Themes/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)