Skip to content

Fix model selection after anonymous usage #5503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinvandijk merged 4 commits into from
Jan 29, 2026
Merged

Fix model selection after anonymous usage #5503

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b90c9e1
Fix model selection
lambertjosh Jan 29, 2026
9aad449
Remove unnecessary changes
lambertjosh Jan 29, 2026
e53f086
Add changeset
kevinvandijk Jan 29, 2026
babe584
Merge branch 'main' into jl-fix-model-picker
kevinvandijk Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/core/webview/__tests__/webviewMessageHandler.autoSwitch.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ describe("webviewMessageHandler - Automatic Organization Switching", () => {
kilocodeToken: "test-token",
kilocodeOrganizationId: "org-1",
},
false,
true, // Changed: Now correctly activates the profile (fix for PR #5415 bug)
)

// Verify flag was set to true after the recursive call
Expand Down Expand Up @@ -407,7 +407,7 @@ describe("webviewMessageHandler - Automatic Organization Switching", () => {
kilocodeToken: "new-token",
kilocodeOrganizationId: undefined,
},
false,
true, // Changed: Now correctly activates the profile (fix for PR #5415 bug)
)
})

Expand Down Expand Up @@ -569,7 +569,7 @@ describe("webviewMessageHandler - Automatic Organization Switching", () => {
kilocodeToken: "test-token",
kilocodeOrganizationId: "org-1",
},
false,
true, // Changed: Now correctly activates the profile (fix for PR #5415 bug)
)

// Verify log message mentions the correct organization
Expand Down
9 changes: 6 additions & 3 deletions src/core/webview/webviewMessageHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2259,11 +2259,13 @@ export const webviewMessageHandler = async (
if (message.text && message.apiConfiguration) {
let configToSave = message.apiConfiguration
let organizationChanged = false
let currentConfig: any = undefined

try {
const { ...currentConfig } = await provider.providerSettingsManager.getProfile({
currentConfig = await provider.providerSettingsManager.getProfile({
name: message.text,
})

// Only clear organization ID if we actually had a kilocode token before and it's different now
const hadPreviousToken = currentConfig.kilocodeToken !== undefined
const hasNewToken = message.apiConfiguration.kilocodeToken !== undefined
Expand Down Expand Up @@ -2301,11 +2303,12 @@ export const webviewMessageHandler = async (
})
}
} catch (error) {
// Config might not exist yet, that's fine
// Profile doesn't exist yet (expected for new profiles)

This comment was marked as outdated.

Sign in to view

// This is fine - we'll create it below
}

// kilocode_change start: If we're updating the active profile, we need to activate it to ensure it's persisted
const currentApiConfigName = getGlobalState("currentApiConfigName")
const currentApiConfigName = getGlobalState("currentApiConfigName") || "default"

@kilo-code-bot kilo-code-bot Bot Jan 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SUGGESTION: Prefer nullish coalescing to avoid treating falsy-but-valid values as "default"

Using || will replace any falsy value (e.g. an empty string) with "default". If currentApiConfigName is only ever string | undefined, using ?? is a safer defaulting pattern.

Suggested change
const currentApiConfigName = getGlobalState("currentApiConfigName") || "default"
const currentApiConfigName = getGlobalState("currentApiConfigName") ?? "default"

@kilo-code-bot kilo-code-bot Bot Jan 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SUGGESTION: Prefer nullish coalescing (??) over || when defaulting currentApiConfigName

Using || treats "" (empty string) as missing. If currentApiConfigName can ever be an empty string (e.g. corrupted/migrated state), this will unexpectedly fall back to "default". ?? only falls back for null/undefined.

Suggested change
const currentApiConfigName = getGlobalState("currentApiConfigName") || "default"
const currentApiConfigName = getGlobalState("currentApiConfigName") ?? "default"

const isActiveProfile = message.text === currentApiConfigName
await provider.upsertProviderProfile(message.text, configToSave, isActiveProfile) // Activate if it's the current active profile
vscode.commands.executeCommand("kilo-code.ghost.reload")
Expand Down
Loading