Skip to content

Commit 6591cdb

Browse files
Tighten custom provider review fixes
Remove debug logging of OpenAI-compatible conversation and SSE payloads. Resolve provider selections through canonicalized IDs so stale casing or spacing maps back to the stored provider.
1 parent 4b7c963 commit 6591cdb

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

src/popup/sections/api-modes-provider-utils.mjs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,16 @@ export function createProviderId(providerName, existingProviders, reservedProvid
9797
export function resolveSelectableProviderId(providerId, providers, fallbackProviderId = '') {
9898
const normalizedProviderId = normalizeText(providerId)
9999
if (!normalizedProviderId) return fallbackProviderId
100-
const hasMatchedProvider =
100+
const normalizedLookupProviderId = normalizeProviderId(normalizedProviderId)
101+
const matchedProvider =
101102
Array.isArray(providers) &&
102-
providers.some(
103+
providers.find(
103104
(provider) =>
104-
normalizeText(provider?.id) === normalizedProviderId && provider?.enabled !== false,
105+
normalizeProviderId(provider?.id) === normalizedLookupProviderId &&
106+
provider?.enabled !== false,
105107
)
106-
return hasMatchedProvider ? normalizedProviderId : fallbackProviderId
108+
if (!matchedProvider) return fallbackProviderId
109+
return normalizeText(matchedProvider?.id) || normalizedProviderId
107110
}
108111

109112
export function resolveEditingProviderSelection(

src/services/apis/openai-compatible-core.mjs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ export async function generateAnswersWithOpenAICompatible({
112112
if (finished) return
113113
finished = true
114114
pushRecord(session, question, answer)
115-
console.debug('conversation history', { content: session.conversationRecords })
116115
port.postMessage({ answer: null, done: true, session: session })
117116
}
118117

@@ -122,7 +121,6 @@ export async function generateAnswersWithOpenAICompatible({
122121
headers: buildHeaders(apiKey, extraHeaders),
123122
body: JSON.stringify(requestBody),
124123
onMessage(message) {
125-
console.debug('sse message', message)
126124
if (finished) return
127125
if (message.trim() === '[DONE]') {
128126
finish()

tests/unit/popup/api-modes-provider-utils.test.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,12 @@ test('resolveSelectableProviderId falls back when provider is missing or invalid
371371
assert.equal(resolveSelectableProviderId(' ', providers, fallbackId), fallbackId)
372372
})
373373

374+
test('resolveSelectableProviderId matches normalized provider ids and returns canonical id', () => {
375+
const providers = [{ id: 'my-proxy' }]
376+
377+
assert.equal(resolveSelectableProviderId(' My Proxy ', providers, ''), 'my-proxy')
378+
})
379+
374380
test('resolveEditingProviderSelection keeps legacy provider selection for empty or legacy values', () => {
375381
const providers = [{ id: 'myproxy' }]
376382

0 commit comments

Comments
 (0)